From d1d6a80fe7e2d3e84b965d8064de1b630d7e04c6 Mon Sep 17 00:00:00 2001 From: Emmanuel Garette Date: Sat, 5 Mar 2022 10:57:55 +0100 Subject: [PATCH] add systemd timer + a service and a timer can have same name --- doc/service/README.md | 1 + doc/service/file.md | 2 +- doc/service/ip.md | 2 +- doc/service/override.md | 2 +- src/rougail/annotator/service.py | 4 +-- src/rougail/data/rougail.dtd | 2 +- src/rougail/objspace.py | 2 ++ src/rougail/template/base.py | 10 ++----- src/rougail/template/systemd.py | 24 ++++++----------- .../dictionaries/00empty/makedict/after.json | 4 +-- tests/dictionaries/00empty/makedict/base.json | 4 +-- .../dictionaries/00empty/makedict/before.json | 4 +-- tests/dictionaries/00empty/tiramisu/base.py | 2 +- .../00load_subfolder/makedict/after.json | 4 +-- .../00load_subfolder/makedict/base.json | 4 +-- .../00load_subfolder/makedict/before.json | 4 +-- .../01base_file/makedict/after.json | 12 ++++----- .../01base_file/makedict/base.json | 12 ++++----- .../01base_file/makedict/before.json | 12 ++++----- .../dictionaries/01base_file/tiramisu/base.py | 2 +- .../01base_file_disabled/makedict/after.json | 16 +++++------ .../01base_file_disabled/makedict/base.json | 16 +++++------ .../01base_file_disabled/makedict/before.json | 16 +++++------ .../01base_file_disabled/tiramisu/base.py | 2 +- .../01base_file_include/makedict/after.json | 12 ++++----- .../01base_file_include/makedict/base.json | 12 ++++----- .../01base_file_include/makedict/before.json | 12 ++++----- .../01base_file_include/tiramisu/base.py | 2 +- .../makedict/after.json | 16 +++++------ .../makedict/base.json | 16 +++++------ .../makedict/before.json | 16 +++++------ .../tiramisu/base.py | 2 +- .../makedict/after.json | 16 +++++------ .../makedict/base.json | 16 +++++------ .../makedict/before.json | 16 +++++------ .../01base_file_include_name/tiramisu/base.py | 2 +- .../01base_file_owner/makedict/after.json | 20 +++++++------- .../01base_file_owner/makedict/base.json | 20 +++++++------- .../01base_file_owner/makedict/before.json | 20 +++++++------- .../01base_file_owner/tiramisu/base.py | 2 +- .../makedict/after.json | 20 +++++++------- .../makedict/base.json | 20 +++++++------- .../makedict/before.json | 20 +++++++------- .../tiramisu/base.py | 2 +- .../01base_file_patch/makedict/after.json | 12 ++++----- .../01base_file_patch/makedict/base.json | 12 ++++----- .../01base_file_patch/makedict/before.json | 12 ++++----- .../01base_file_patch/tiramisu/base.py | 2 +- .../01base_file_utfchar/makedict/after.json | 12 ++++----- .../01base_file_utfchar/makedict/base.json | 12 ++++----- .../01base_file_utfchar/makedict/before.json | 12 ++++----- .../01base_file_utfchar/tiramisu/base.py | 2 +- .../makedict/after.json | 8 +++--- .../makedict/base.json | 8 +++--- .../makedict/before.json | 8 +++--- .../tiramisu/base.py | 2 +- .../makedict/after.json | 8 +++--- .../makedict/base.json | 8 +++--- .../makedict/before.json | 8 +++--- .../tiramisu/base.py | 2 +- .../makedict/after.json | 8 +++--- .../makedict/base.json | 8 +++--- .../makedict/before.json | 8 +++--- .../tiramisu/base.py | 2 +- .../makedict/after.json | 8 +++--- .../makedict/base.json | 8 +++--- .../makedict/before.json | 8 +++--- .../tiramisu/base.py | 2 +- .../makedict/after.json | 8 +++--- .../makedict/base.json | 8 +++--- .../makedict/before.json | 8 +++--- .../tiramisu/base.py | 2 +- .../makedict/after.json | 8 +++--- .../makedict/base.json | 8 +++--- .../makedict/before.json | 8 +++--- .../tiramisu/base.py | 2 +- .../makedict/after.json | 8 +++--- .../makedict/base.json | 8 +++--- .../makedict/before.json | 8 +++--- .../tiramisu/base.py | 2 +- .../makedict/after.json | 8 +++--- .../makedict/base.json | 8 +++--- .../makedict/before.json | 8 +++--- .../tiramisu/base.py | 2 +- .../makedict/after.json | 8 +++--- .../makedict/base.json | 8 +++--- .../makedict/before.json | 8 +++--- .../tiramisu/base.py | 2 +- .../makedict/after.json | 8 +++--- .../makedict/base.json | 8 +++--- .../makedict/before.json | 8 +++--- .../tiramisu/base.py | 2 +- .../makedict/after.json | 8 +++--- .../makedict/base.json | 8 +++--- .../makedict/before.json | 8 +++--- .../tiramisu/base.py | 2 +- .../makedict/after.json | 8 +++--- .../makedict/base.json | 8 +++--- .../makedict/before.json | 8 +++--- .../tiramisu/base.py | 2 +- .../makedict/after.json | 12 ++++----- .../makedict/base.json | 12 ++++----- .../makedict/before.json | 12 ++++----- .../tiramisu/base.py | 2 +- .../makedict/after.json | 8 +++--- .../makedict/base.json | 8 +++--- .../makedict/before.json | 8 +++--- .../tiramisu/base.py | 2 +- .../makedict/after.json | 8 +++--- .../makedict/base.json | 8 +++--- .../makedict/before.json | 8 +++--- .../tiramisu/base.py | 2 +- .../makedict/after.json | 8 +++--- .../makedict/base.json | 8 +++--- .../makedict/before.json | 8 +++--- .../tiramisu/base.py | 2 +- .../makedict/after.json | 8 +++--- .../makedict/base.json | 8 +++--- .../makedict/before.json | 8 +++--- .../tiramisu/base.py | 2 +- .../makedict/after.json | 8 +++--- .../makedict/base.json | 8 +++--- .../makedict/before.json | 8 +++--- .../tiramisu/base.py | 2 +- .../makedict/after.json | 8 +++--- .../makedict/base.json | 8 +++--- .../makedict/before.json | 8 +++--- .../tiramisu/base.py | 2 +- .../20notemplating/makedict/after.json | 8 +++--- .../20notemplating/makedict/base.json | 8 +++--- .../20notemplating/makedict/before.json | 8 +++--- .../20notemplating/tiramisu/base.py | 2 +- .../20override/makedict/after.json | 12 ++++----- .../20override/makedict/base.json | 12 ++++----- .../20override/makedict/before.json | 12 ++++----- .../dictionaries/20override/tiramisu/base.py | 8 +++--- .../makedict/after.json | 6 ++--- .../makedict/base.json | 6 ++--- .../makedict/before.json | 6 ++--- .../20override_no_templating/tiramisu/base.py | 4 +-- .../20override_source/makedict/after.json | 6 ++--- .../20override_source/makedict/base.json | 6 ++--- .../20override_source/makedict/before.json | 6 ++--- .../20override_source/tiramisu/base.py | 4 +-- .../40ifin_leadershipauto/makedict/after.json | 8 +++--- .../40ifin_leadershipauto/makedict/base.json | 8 +++--- .../makedict/before.json | 8 +++--- .../40ifin_leadershipauto/tiramisu/base.py | 2 +- .../makedict/after.json | 12 ++++----- .../makedict/base.json | 12 ++++----- .../makedict/before.json | 12 ++++----- .../tiramisu/base.py | 2 +- .../makedict/after.json | 8 +++--- .../45extra_without_family/makedict/base.json | 8 +++--- .../makedict/before.json | 8 +++--- .../45extra_without_family/tiramisu/base.py | 2 +- .../makedict/after.json | 8 +++--- .../makedict/base.json | 8 +++--- .../makedict/before.json | 8 +++--- .../tiramisu/base.py | 2 +- .../60extra_help/makedict/after.json | 8 +++--- .../60extra_help/makedict/base.json | 8 +++--- .../60extra_help/makedict/before.json | 8 +++--- .../60extra_help/tiramisu/base.py | 2 +- .../60extra_leadership/makedict/after.json | 12 ++++----- .../60extra_leadership/makedict/base.json | 12 ++++----- .../60extra_leadership/makedict/before.json | 12 ++++----- .../60extra_leadership/tiramisu/base.py | 2 +- .../makedict/after.json | 12 ++++----- .../makedict/base.json | 12 ++++----- .../makedict/before.json | 12 ++++----- .../60extra_leadership_name/tiramisu/base.py | 2 +- .../makedict/after.json | 12 ++++----- .../makedict/base.json | 12 ++++----- .../makedict/before.json | 12 ++++----- .../tiramisu/base.py | 2 +- .../makedict/after.json | 12 ++++----- .../makedict/base.json | 12 ++++----- .../makedict/before.json | 12 ++++----- .../tiramisu/base.py | 2 +- .../70container_files/makedict/after.json | 12 ++++----- .../70container_files/makedict/base.json | 12 ++++----- .../70container_files/makedict/before.json | 12 ++++----- .../70container_files/tiramisu/base.py | 2 +- .../makedict/after.json | 12 ++++----- .../makedict/base.json | 12 ++++----- .../makedict/before.json | 12 ++++----- .../tiramisu/base.py | 2 +- .../makedict/after.json | 16 +++++------ .../makedict/base.json | 16 +++++------ .../makedict/before.json | 16 +++++------ .../tiramisu/base.py | 2 +- .../makedict/after.json | 10 +++---- .../makedict/base.json | 10 +++---- .../makedict/before.json | 10 +++---- .../tiramisu/base.py | 2 +- .../makedict/after.json | 16 +++++------ .../makedict/base.json | 16 +++++------ .../makedict/before.json | 16 +++++------ .../70container_files_twice/tiramisu/base.py | 2 +- .../makedict/after.json | 12 ++++----- .../70container_filesmulti/makedict/base.json | 12 ++++----- .../makedict/before.json | 12 ++++----- .../70container_filesmulti/tiramisu/base.py | 2 +- .../makedict/after.json | 8 +++--- .../makedict/base.json | 8 +++--- .../makedict/before.json | 8 +++--- .../tiramisu/base.py | 2 +- .../70container_new/makedict/after.json | 4 +-- .../70container_new/makedict/base.json | 4 +-- .../70container_new/makedict/before.json | 4 +-- .../70container_new/tiramisu/base.py | 2 +- .../70container_newnocont/makedict/after.json | 4 +-- .../70container_newnocont/makedict/base.json | 4 +-- .../makedict/before.json | 4 +-- .../70container_newnocont/tiramisu/base.py | 2 +- .../70container_newwithip/makedict/after.json | 4 +-- .../70container_newwithip/makedict/base.json | 4 +-- .../makedict/before.json | 4 +-- .../70container_newwithip/tiramisu/base.py | 2 +- .../70service_base/makedict/after.json | 4 +-- .../70service_base/makedict/base.json | 4 +-- .../70service_base/makedict/before.json | 4 +-- .../70service_base/tiramisu/base.py | 2 +- .../70service_disabled/makedict/after.json | 4 +-- .../70service_disabled/makedict/base.json | 4 +-- .../70service_disabled/makedict/before.json | 4 +-- .../70service_disabled/tiramisu/base.py | 2 +- .../makedict/after.json | 4 +-- .../makedict/base.json | 4 +-- .../makedict/before.json | 4 +-- .../tiramisu/base.py | 2 +- .../70service_engine/makedict/after.json | 4 +-- .../70service_engine/makedict/base.json | 4 +-- .../70service_engine/makedict/before.json | 4 +-- .../70service_engine/tiramisu/base.py | 2 +- .../70service_engine_dash/makedict/after.json | 4 +-- .../70service_engine_dash/makedict/base.json | 4 +-- .../makedict/before.json | 4 +-- .../70service_engine_dash/tiramisu/base.py | 2 +- .../70service_mount/makedict/after.json | 4 +-- .../70service_mount/makedict/base.json | 4 +-- .../70service_mount/makedict/before.json | 4 +-- .../70service_mount/tiramisu/base.py | 2 +- .../70service_not_managed/makedict/after.json | 8 +++--- .../70service_not_managed/makedict/base.json | 8 +++--- .../makedict/before.json | 8 +++--- .../70service_not_managed/tiramisu/base.py | 2 +- .../70service_servicelist/makedict/after.json | 4 +-- .../70service_servicelist/makedict/base.json | 4 +-- .../makedict/before.json | 4 +-- .../70service_servicelist/tiramisu/base.py | 2 +- .../makedict/after.json | 4 +-- .../makedict/base.json | 4 +-- .../makedict/before.json | 4 +-- .../tiramisu/base.py | 2 +- .../makedict/after.json | 4 +-- .../makedict/base.json | 4 +-- .../makedict/before.json | 4 +-- .../tiramisu/base.py | 2 +- .../makedict/after.json | 8 +++--- .../makedict/base.json | 8 +++--- .../makedict/before.json | 8 +++--- .../tiramisu/base.py | 2 +- .../makedict/after.json | 8 +++--- .../makedict/base.json | 8 +++--- .../makedict/before.json | 8 +++--- .../70service_servicelist_ip/tiramisu/base.py | 2 +- .../makedict/after.json | 4 +-- .../makedict/base.json | 4 +-- .../makedict/before.json | 4 +-- .../tiramisu/base.py | 2 +- .../70service_target/makedict/after.json | 4 +-- .../70service_target/makedict/base.json | 4 +-- .../70service_target/makedict/before.json | 4 +-- .../70service_target/tiramisu/base.py | 2 +- .../makedict/after.json | 4 +-- .../makedict/base.json | 4 +-- .../makedict/before.json | 4 +-- .../70service_target_engine/tiramisu/base.py | 2 +- .../dictionaries/70service_timer/00-base.xml | 7 +++++ .../dictionaries/70service_timer/__init__.py | 0 .../70service_timer/makedict/after.json | 18 +++++++++++++ .../70service_timer/makedict/base.json | 6 +++++ .../70service_timer/makedict/before.json | 18 +++++++++++++ .../result/systemd/system/testsrv.service | 1 + .../result/systemd/system/testsrv.timer | 1 + .../result/tmpfiles.d/0rougail.conf | 0 .../70service_timer/tiramisu/base.py | 27 +++++++++++++++++++ .../70service_timer/tmpl/testsrv.service | 1 + .../70service_timer/tmpl/testsrv.timer | 1 + .../70services_ip/makedict/after.json | 8 +++--- .../70services_ip/makedict/base.json | 8 +++--- .../70services_ip/makedict/before.json | 8 +++--- .../70services_ip/tiramisu/base.py | 2 +- .../70services_ip_cidr/makedict/after.json | 8 +++--- .../70services_ip_cidr/makedict/base.json | 8 +++--- .../70services_ip_cidr/makedict/before.json | 8 +++--- .../70services_ip_cidr/tiramisu/base.py | 2 +- .../makedict/after.json | 6 ++--- .../70services_ip_disabled/makedict/base.json | 6 ++--- .../makedict/before.json | 6 ++--- .../70services_ip_disabled/tiramisu/base.py | 2 +- .../70services_ip_iplist/makedict/after.json | 8 +++--- .../70services_ip_iplist/makedict/base.json | 8 +++--- .../70services_ip_iplist/makedict/before.json | 8 +++--- .../70services_ip_iplist/tiramisu/base.py | 2 +- .../70services_ip_iplist2/makedict/after.json | 8 +++--- .../70services_ip_iplist2/makedict/base.json | 8 +++--- .../makedict/before.json | 8 +++--- .../70services_ip_iplist2/tiramisu/base.py | 2 +- .../makedict/after.json | 10 +++---- .../makedict/base.json | 10 +++---- .../makedict/before.json | 10 +++---- .../70services_ip_leadership/tiramisu/base.py | 2 +- .../70services_ip_multi/makedict/after.json | 8 +++--- .../70services_ip_multi/makedict/base.json | 8 +++--- .../70services_ip_multi/makedict/before.json | 8 +++--- .../70services_ip_multi/tiramisu/base.py | 2 +- .../70services_ip_network/makedict/after.json | 10 +++---- .../70services_ip_network/makedict/base.json | 10 +++---- .../makedict/before.json | 10 +++---- .../70services_ip_network/tiramisu/base.py | 2 +- .../makedict/after.json | 8 +++--- .../makedict/base.json | 8 +++--- .../makedict/before.json | 8 +++--- .../tiramisu/base.py | 2 +- .../70services_ip_twice/makedict/after.json | 12 ++++----- .../70services_ip_twice/makedict/base.json | 12 ++++----- .../70services_ip_twice/makedict/before.json | 12 ++++----- .../70services_ip_twice/tiramisu/base.py | 2 +- 331 files changed, 1201 insertions(+), 1132 deletions(-) create mode 100644 tests/dictionaries/70service_timer/00-base.xml create mode 100644 tests/dictionaries/70service_timer/__init__.py create mode 100644 tests/dictionaries/70service_timer/makedict/after.json create mode 100644 tests/dictionaries/70service_timer/makedict/base.json create mode 100644 tests/dictionaries/70service_timer/makedict/before.json create mode 100644 tests/dictionaries/70service_timer/result/systemd/system/testsrv.service create mode 100644 tests/dictionaries/70service_timer/result/systemd/system/testsrv.timer create mode 100644 tests/dictionaries/70service_timer/result/tmpfiles.d/0rougail.conf create mode 100644 tests/dictionaries/70service_timer/tiramisu/base.py create mode 100644 tests/dictionaries/70service_timer/tmpl/testsrv.service create mode 100644 tests/dictionaries/70service_timer/tmpl/testsrv.timer diff --git a/doc/service/README.md b/doc/service/README.md index b1932fb4..9a9cd570 100644 --- a/doc/service/README.md +++ b/doc/service/README.md @@ -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 - mount : fichier utilisé par systemd-mount - swap : fichier utilisé par systemd-swap +- timer : tâche planifié pour systemd ``` diff --git a/doc/service/file.md b/doc/service/file.md index f9a4f025..671e574f 100644 --- a/doc/service/file.md +++ b/doc/service/file.md @@ -2,7 +2,7 @@ ## 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. diff --git a/doc/service/ip.md b/doc/service/ip.md index 229eb21f..5cffadf1 100644 --- a/doc/service/ip.md +++ b/doc/service/ip.md @@ -2,7 +2,7 @@ ## 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. diff --git a/doc/service/override.md b/doc/service/override.md index 2306294b..68463ef9 100644 --- a/doc/service/override.md +++ b/doc/service/override.md @@ -2,7 +2,7 @@ ## 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. diff --git a/src/rougail/annotator/service.py b/src/rougail/annotator/service.py index ebec54c9..5bad02aa 100644 --- a/src/rougail/annotator/service.py +++ b/src/rougail/annotator/service.py @@ -253,7 +253,7 @@ class Annotator: variable.mode = None variable.type = type_ 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 needed_type = self.objectspace.types[dtd_key_type] if needed_type not in ('variable', variable.opt.type): @@ -285,7 +285,7 @@ class Annotator: self.uniq_overrides.append(service_name) override.name = service_name if not hasattr(override, 'source'): - override.source = f'{service_name}.service' + override.source = service_name @staticmethod def _update_file(file_, diff --git a/src/rougail/data/rougail.dtd b/src/rougail/data/rougail.dtd index efb7edb6..8c81b8e8 100644 --- a/src/rougail/data/rougail.dtd +++ b/src/rougail/data/rougail.dtd @@ -53,7 +53,7 @@ - + diff --git a/src/rougail/objspace.py b/src/rougail/objspace.py index ea48373c..8dc98b7d 100644 --- a/src/rougail/objspace.py +++ b/src/rougail/objspace.py @@ -286,6 +286,8 @@ class RougailObjSpace: ) -> Optional[str]: if child.tag == 'variables': return namespace + if child.tag == 'service': + return child.attrib['name'] + '.' + child.attrib.get('type', 'service') if 'name' in child.attrib: return child.attrib['name'] if child.text and child.tag in self.forced_text_elts_as_name: diff --git a/src/rougail/template/base.py b/src/rougail/template/base.py index aa324cb1..a7269c3b 100644 --- a/src/rougail/template/base.py +++ b/src/rougail/template/base.py @@ -276,7 +276,6 @@ class RougailBaseTemplate: filevar: Dict, type_: str, service_name: str, - service_type: str, ) -> str: """Run templatisation on one file """ @@ -302,7 +301,6 @@ class RougailBaseTemplate: data = getattr(self, func)(filevar, filename, service_name, - service_type, variable, idx, ) @@ -359,10 +357,9 @@ class RougailBaseTemplate: for included in (True, False): for service_obj in await self.config.option('services').list('all'): 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 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 if not included: engine = await service_obj.information.get('engine', None) @@ -370,13 +367,11 @@ class RougailBaseTemplate: self.instance_file({'engine': engine}, 'service', service_name, - service_type, ) target_name = await service_obj.information.get('target', None) if target_name: self.target_service(service_name, target_name, - service_type, engine is None, ) for fills in await service_obj.list('optiondescription'): @@ -395,13 +390,12 @@ class RougailBaseTemplate: destfilenames = self.instance_file(fill, type_, service_name, - service_type, ) if included and fill.get('included', 'no') == 'content': files_to_delete.extend(destfilenames) else: 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: unlink(filename) parent = filename diff --git a/src/rougail/template/systemd.py b/src/rougail/template/systemd.py index 4370bcbe..ba3ef576 100644 --- a/src/rougail/template/systemd.py +++ b/src/rougail/template/systemd.py @@ -82,7 +82,6 @@ class RougailSystemdTemplate(RougailBaseTemplate): filevar: Dict, destfile: str, service_name: str, - service_type: str, variable, idx: int, ) -> tuple: @@ -101,7 +100,6 @@ class RougailSystemdTemplate(RougailBaseTemplate): filevar: Dict, destfile, service_name: str, - service_type: str, *args, ) -> tuple: 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)}')) tmp_file = join(self.tmp_dir, source) 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 def get_data_ip(self, filevar: Dict, ip, service_name: str, - service_type: str, var: Any, idx: int, *args, @@ -136,45 +133,40 @@ class RougailSystemdTemplate(RougailBaseTemplate): servicevar: Dict, info, service_name: str, - service_type: str, *args, ): - filename = f'{service_name}.{service_type}' - tmp_file = join(self.tmp_dir, filename) + tmp_file = join(self.tmp_dir, service_name) var = None - destfile = f'/systemd/system/{filename}' + destfile = f'/systemd/system/{service_name}' return tmp_file, None, destfile, var def desactive_service(self, 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) symlink('/dev/null', filename) def target_service(self, service_name: str, target_name: str, - service_type: 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) if global_service: - source_filename = f'{ROUGAIL_GLOBAL_SYSTEMD_FILE}/{service_name}.{service_type}' + source_filename = f'{ROUGAIL_GLOBAL_SYSTEMD_FILE}/{service_name}' 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) def post_instance_service(self, service_name: str, - service_type: str, ) -> None: # pragma: no cover if self.ip_per_service is None: 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:]) makedirs(dirname(destfilename), exist_ok=True) self.log.info(_(f"creole processing: '{destfilename}'")) diff --git a/tests/dictionaries/00empty/makedict/after.json b/tests/dictionaries/00empty/makedict/after.json index fd94145f..9cd2d3dd 100644 --- a/tests/dictionaries/00empty/makedict/after.json +++ b/tests/dictionaries/00empty/makedict/after.json @@ -1,9 +1,9 @@ { - "services.tata.activate": { + "services.tata_service.activate": { "owner": "default", "value": true }, - "services.tata.manage": { + "services.tata_service.manage": { "owner": "default", "value": true } diff --git a/tests/dictionaries/00empty/makedict/base.json b/tests/dictionaries/00empty/makedict/base.json index df4366ea..2bcec697 100644 --- a/tests/dictionaries/00empty/makedict/base.json +++ b/tests/dictionaries/00empty/makedict/base.json @@ -1,4 +1,4 @@ { - "services.tata.activate": true, - "services.tata.manage": true + "services.tata_service.activate": true, + "services.tata_service.manage": true } diff --git a/tests/dictionaries/00empty/makedict/before.json b/tests/dictionaries/00empty/makedict/before.json index fd94145f..9cd2d3dd 100644 --- a/tests/dictionaries/00empty/makedict/before.json +++ b/tests/dictionaries/00empty/makedict/before.json @@ -1,9 +1,9 @@ { - "services.tata.activate": { + "services.tata_service.activate": { "owner": "default", "value": true }, - "services.tata.manage": { + "services.tata_service.manage": { "owner": "default", "value": true } diff --git a/tests/dictionaries/00empty/tiramisu/base.py b/tests/dictionaries/00empty/tiramisu/base.py index 79bafb3e..d97201fd 100644 --- a/tests/dictionaries/00empty/tiramisu/base.py +++ b/tests/dictionaries/00empty/tiramisu/base.py @@ -16,6 +16,6 @@ except: from tiramisu import * option_3 = BoolOption(name="activate", doc="activate", 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_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1]) diff --git a/tests/dictionaries/00load_subfolder/makedict/after.json b/tests/dictionaries/00load_subfolder/makedict/after.json index 6ebfbbe9..39ed60d0 100644 --- a/tests/dictionaries/00load_subfolder/makedict/after.json +++ b/tests/dictionaries/00load_subfolder/makedict/after.json @@ -1,9 +1,9 @@ { - "rougail.general.mode_conteneur_actif": { + "rougail.general.mode_conteneur_actif1": { "owner": "default", "value": "non" }, - "rougail.general.mode_conteneur_actif1": { + "rougail.general.mode_conteneur_actif": { "owner": "default", "value": "non" } diff --git a/tests/dictionaries/00load_subfolder/makedict/base.json b/tests/dictionaries/00load_subfolder/makedict/base.json index 3f1a7b00..fb54e438 100644 --- a/tests/dictionaries/00load_subfolder/makedict/base.json +++ b/tests/dictionaries/00load_subfolder/makedict/base.json @@ -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" } diff --git a/tests/dictionaries/00load_subfolder/makedict/before.json b/tests/dictionaries/00load_subfolder/makedict/before.json index 6ebfbbe9..39ed60d0 100644 --- a/tests/dictionaries/00load_subfolder/makedict/before.json +++ b/tests/dictionaries/00load_subfolder/makedict/before.json @@ -1,9 +1,9 @@ { - "rougail.general.mode_conteneur_actif": { + "rougail.general.mode_conteneur_actif1": { "owner": "default", "value": "non" }, - "rougail.general.mode_conteneur_actif1": { + "rougail.general.mode_conteneur_actif": { "owner": "default", "value": "non" } diff --git a/tests/dictionaries/01base_file/makedict/after.json b/tests/dictionaries/01base_file/makedict/after.json index c8edf346..70ca0c16 100644 --- a/tests/dictionaries/01base_file/makedict/after.json +++ b/tests/dictionaries/01base_file/makedict/after.json @@ -3,27 +3,27 @@ "owner": "default", "value": "non" }, - "services.test.files.file.name": { + "services.test_service.files.file.name": { "owner": "default", "value": "/etc/file" }, - "services.test.files.file.activate": { + "services.test_service.files.file.activate": { "owner": "default", "value": true }, - "services.test.files.file2.name": { + "services.test_service.files.file2.name": { "owner": "default", "value": "/etc/file2" }, - "services.test.files.file2.activate": { + "services.test_service.files.file2.activate": { "owner": "default", "value": true }, - "services.test.activate": { + "services.test_service.activate": { "owner": "default", "value": true }, - "services.test.manage": { + "services.test_service.manage": { "owner": "default", "value": true } diff --git a/tests/dictionaries/01base_file/makedict/base.json b/tests/dictionaries/01base_file/makedict/base.json index c9048468..8f8bc2b3 100644 --- a/tests/dictionaries/01base_file/makedict/base.json +++ b/tests/dictionaries/01base_file/makedict/base.json @@ -1,9 +1,9 @@ { "rougail.general.mode_conteneur_actif": "non", - "services.test.files.file.name": "/etc/file", - "services.test.files.file.activate": true, - "services.test.files.file2.name": "/etc/file2", - "services.test.files.file2.activate": true, - "services.test.activate": true, - "services.test.manage": true + "services.test_service.files.file.name": "/etc/file", + "services.test_service.files.file.activate": true, + "services.test_service.files.file2.name": "/etc/file2", + "services.test_service.files.file2.activate": true, + "services.test_service.activate": true, + "services.test_service.manage": true } diff --git a/tests/dictionaries/01base_file/makedict/before.json b/tests/dictionaries/01base_file/makedict/before.json index c8edf346..70ca0c16 100644 --- a/tests/dictionaries/01base_file/makedict/before.json +++ b/tests/dictionaries/01base_file/makedict/before.json @@ -3,27 +3,27 @@ "owner": "default", "value": "non" }, - "services.test.files.file.name": { + "services.test_service.files.file.name": { "owner": "default", "value": "/etc/file" }, - "services.test.files.file.activate": { + "services.test_service.files.file.activate": { "owner": "default", "value": true }, - "services.test.files.file2.name": { + "services.test_service.files.file2.name": { "owner": "default", "value": "/etc/file2" }, - "services.test.files.file2.activate": { + "services.test_service.files.file2.activate": { "owner": "default", "value": true }, - "services.test.activate": { + "services.test_service.activate": { "owner": "default", "value": true }, - "services.test.manage": { + "services.test_service.manage": { "owner": "default", "value": true } diff --git a/tests/dictionaries/01base_file/tiramisu/base.py b/tests/dictionaries/01base_file/tiramisu/base.py index abf86944..59673559 100644 --- a/tests/dictionaries/01base_file/tiramisu/base.py +++ b/tests/dictionaries/01base_file/tiramisu/base.py @@ -29,6 +29,6 @@ option_10.impl_set_information('source', "file2") option_6 = OptionDescription(name="files", doc="files", children=[option_7, option_10]) option_13 = BoolOption(name="activate", doc="activate", 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_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, option_4]) diff --git a/tests/dictionaries/01base_file_disabled/makedict/after.json b/tests/dictionaries/01base_file_disabled/makedict/after.json index 255e30bc..9e1e587c 100644 --- a/tests/dictionaries/01base_file_disabled/makedict/after.json +++ b/tests/dictionaries/01base_file_disabled/makedict/after.json @@ -3,35 +3,35 @@ "owner": "default", "value": "non" }, - "services.test.files.file.name": { + "services.test_service.files.file.name": { "owner": "default", "value": "/etc/file" }, - "services.test.files.file.activate": { + "services.test_service.files.file.activate": { "owner": "default", "value": true }, - "services.test.files.file2.name": { + "services.test_service.files.file2.name": { "owner": "default", "value": "/etc/file2" }, - "services.test.files.file2.activate": { + "services.test_service.files.file2.activate": { "owner": "default", "value": true }, - "services.test.files.file3.name": { + "services.test_service.files.file3.name": { "owner": "default", "value": "/etc/file3" }, - "services.test.files.file3.activate": { + "services.test_service.files.file3.activate": { "owner": "default", "value": false }, - "services.test.activate": { + "services.test_service.activate": { "owner": "default", "value": true }, - "services.test.manage": { + "services.test_service.manage": { "owner": "default", "value": true } diff --git a/tests/dictionaries/01base_file_disabled/makedict/base.json b/tests/dictionaries/01base_file_disabled/makedict/base.json index 1b8f6948..725c9844 100644 --- a/tests/dictionaries/01base_file_disabled/makedict/base.json +++ b/tests/dictionaries/01base_file_disabled/makedict/base.json @@ -1,11 +1,11 @@ { "rougail.general.mode_conteneur_actif": "non", - "services.test.files.file.name": "/etc/file", - "services.test.files.file.activate": true, - "services.test.files.file2.name": "/etc/file2", - "services.test.files.file2.activate": true, - "services.test.files.file3.name": "/etc/file3", - "services.test.files.file3.activate": false, - "services.test.activate": true, - "services.test.manage": true + "services.test_service.files.file.name": "/etc/file", + "services.test_service.files.file.activate": true, + "services.test_service.files.file2.name": "/etc/file2", + "services.test_service.files.file2.activate": true, + "services.test_service.files.file3.name": "/etc/file3", + "services.test_service.files.file3.activate": false, + "services.test_service.activate": true, + "services.test_service.manage": true } diff --git a/tests/dictionaries/01base_file_disabled/makedict/before.json b/tests/dictionaries/01base_file_disabled/makedict/before.json index 255e30bc..9e1e587c 100644 --- a/tests/dictionaries/01base_file_disabled/makedict/before.json +++ b/tests/dictionaries/01base_file_disabled/makedict/before.json @@ -3,35 +3,35 @@ "owner": "default", "value": "non" }, - "services.test.files.file.name": { + "services.test_service.files.file.name": { "owner": "default", "value": "/etc/file" }, - "services.test.files.file.activate": { + "services.test_service.files.file.activate": { "owner": "default", "value": true }, - "services.test.files.file2.name": { + "services.test_service.files.file2.name": { "owner": "default", "value": "/etc/file2" }, - "services.test.files.file2.activate": { + "services.test_service.files.file2.activate": { "owner": "default", "value": true }, - "services.test.files.file3.name": { + "services.test_service.files.file3.name": { "owner": "default", "value": "/etc/file3" }, - "services.test.files.file3.activate": { + "services.test_service.files.file3.activate": { "owner": "default", "value": false }, - "services.test.activate": { + "services.test_service.activate": { "owner": "default", "value": true }, - "services.test.manage": { + "services.test_service.manage": { "owner": "default", "value": true } diff --git a/tests/dictionaries/01base_file_disabled/tiramisu/base.py b/tests/dictionaries/01base_file_disabled/tiramisu/base.py index cb4a393c..80496c42 100644 --- a/tests/dictionaries/01base_file_disabled/tiramisu/base.py +++ b/tests/dictionaries/01base_file_disabled/tiramisu/base.py @@ -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_16 = BoolOption(name="activate", doc="activate", 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_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, option_4]) diff --git a/tests/dictionaries/01base_file_include/makedict/after.json b/tests/dictionaries/01base_file_include/makedict/after.json index c8edf346..70ca0c16 100644 --- a/tests/dictionaries/01base_file_include/makedict/after.json +++ b/tests/dictionaries/01base_file_include/makedict/after.json @@ -3,27 +3,27 @@ "owner": "default", "value": "non" }, - "services.test.files.file.name": { + "services.test_service.files.file.name": { "owner": "default", "value": "/etc/file" }, - "services.test.files.file.activate": { + "services.test_service.files.file.activate": { "owner": "default", "value": true }, - "services.test.files.file2.name": { + "services.test_service.files.file2.name": { "owner": "default", "value": "/etc/file2" }, - "services.test.files.file2.activate": { + "services.test_service.files.file2.activate": { "owner": "default", "value": true }, - "services.test.activate": { + "services.test_service.activate": { "owner": "default", "value": true }, - "services.test.manage": { + "services.test_service.manage": { "owner": "default", "value": true } diff --git a/tests/dictionaries/01base_file_include/makedict/base.json b/tests/dictionaries/01base_file_include/makedict/base.json index c9048468..8f8bc2b3 100644 --- a/tests/dictionaries/01base_file_include/makedict/base.json +++ b/tests/dictionaries/01base_file_include/makedict/base.json @@ -1,9 +1,9 @@ { "rougail.general.mode_conteneur_actif": "non", - "services.test.files.file.name": "/etc/file", - "services.test.files.file.activate": true, - "services.test.files.file2.name": "/etc/file2", - "services.test.files.file2.activate": true, - "services.test.activate": true, - "services.test.manage": true + "services.test_service.files.file.name": "/etc/file", + "services.test_service.files.file.activate": true, + "services.test_service.files.file2.name": "/etc/file2", + "services.test_service.files.file2.activate": true, + "services.test_service.activate": true, + "services.test_service.manage": true } diff --git a/tests/dictionaries/01base_file_include/makedict/before.json b/tests/dictionaries/01base_file_include/makedict/before.json index c8edf346..70ca0c16 100644 --- a/tests/dictionaries/01base_file_include/makedict/before.json +++ b/tests/dictionaries/01base_file_include/makedict/before.json @@ -3,27 +3,27 @@ "owner": "default", "value": "non" }, - "services.test.files.file.name": { + "services.test_service.files.file.name": { "owner": "default", "value": "/etc/file" }, - "services.test.files.file.activate": { + "services.test_service.files.file.activate": { "owner": "default", "value": true }, - "services.test.files.file2.name": { + "services.test_service.files.file2.name": { "owner": "default", "value": "/etc/file2" }, - "services.test.files.file2.activate": { + "services.test_service.files.file2.activate": { "owner": "default", "value": true }, - "services.test.activate": { + "services.test_service.activate": { "owner": "default", "value": true }, - "services.test.manage": { + "services.test_service.manage": { "owner": "default", "value": true } diff --git a/tests/dictionaries/01base_file_include/tiramisu/base.py b/tests/dictionaries/01base_file_include/tiramisu/base.py index abf86944..59673559 100644 --- a/tests/dictionaries/01base_file_include/tiramisu/base.py +++ b/tests/dictionaries/01base_file_include/tiramisu/base.py @@ -29,6 +29,6 @@ option_10.impl_set_information('source', "file2") option_6 = OptionDescription(name="files", doc="files", children=[option_7, option_10]) option_13 = BoolOption(name="activate", doc="activate", 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_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, option_4]) diff --git a/tests/dictionaries/01base_file_include_content/makedict/after.json b/tests/dictionaries/01base_file_include_content/makedict/after.json index 0f9e1770..75db70c3 100644 --- a/tests/dictionaries/01base_file_include_content/makedict/after.json +++ b/tests/dictionaries/01base_file_include_content/makedict/after.json @@ -3,35 +3,35 @@ "owner": "default", "value": "non" }, - "services.test.files.file.name": { + "services.test_service.files.file.name": { "owner": "default", "value": "/etc/file" }, - "services.test.files.file.activate": { + "services.test_service.files.file.activate": { "owner": "default", "value": true }, - "services.test.files.file2.name": { + "services.test_service.files.file2.name": { "owner": "default", "value": "/etc/file2" }, - "services.test.files.file2.activate": { + "services.test_service.files.file2.activate": { "owner": "default", "value": true }, - "services.test.files.incfile.name": { + "services.test_service.files.incfile.name": { "owner": "default", "value": "/etc/dir/incfile" }, - "services.test.files.incfile.activate": { + "services.test_service.files.incfile.activate": { "owner": "default", "value": true }, - "services.test.activate": { + "services.test_service.activate": { "owner": "default", "value": true }, - "services.test.manage": { + "services.test_service.manage": { "owner": "default", "value": true } diff --git a/tests/dictionaries/01base_file_include_content/makedict/base.json b/tests/dictionaries/01base_file_include_content/makedict/base.json index 68409c43..cc167d1a 100644 --- a/tests/dictionaries/01base_file_include_content/makedict/base.json +++ b/tests/dictionaries/01base_file_include_content/makedict/base.json @@ -1,11 +1,11 @@ { "rougail.general.mode_conteneur_actif": "non", - "services.test.files.file.name": "/etc/file", - "services.test.files.file.activate": true, - "services.test.files.file2.name": "/etc/file2", - "services.test.files.file2.activate": true, - "services.test.files.incfile.name": "/etc/dir/incfile", - "services.test.files.incfile.activate": true, - "services.test.activate": true, - "services.test.manage": true + "services.test_service.files.file.name": "/etc/file", + "services.test_service.files.file.activate": true, + "services.test_service.files.file2.name": "/etc/file2", + "services.test_service.files.file2.activate": true, + "services.test_service.files.incfile.name": "/etc/dir/incfile", + "services.test_service.files.incfile.activate": true, + "services.test_service.activate": true, + "services.test_service.manage": true } diff --git a/tests/dictionaries/01base_file_include_content/makedict/before.json b/tests/dictionaries/01base_file_include_content/makedict/before.json index 0f9e1770..75db70c3 100644 --- a/tests/dictionaries/01base_file_include_content/makedict/before.json +++ b/tests/dictionaries/01base_file_include_content/makedict/before.json @@ -3,35 +3,35 @@ "owner": "default", "value": "non" }, - "services.test.files.file.name": { + "services.test_service.files.file.name": { "owner": "default", "value": "/etc/file" }, - "services.test.files.file.activate": { + "services.test_service.files.file.activate": { "owner": "default", "value": true }, - "services.test.files.file2.name": { + "services.test_service.files.file2.name": { "owner": "default", "value": "/etc/file2" }, - "services.test.files.file2.activate": { + "services.test_service.files.file2.activate": { "owner": "default", "value": true }, - "services.test.files.incfile.name": { + "services.test_service.files.incfile.name": { "owner": "default", "value": "/etc/dir/incfile" }, - "services.test.files.incfile.activate": { + "services.test_service.files.incfile.activate": { "owner": "default", "value": true }, - "services.test.activate": { + "services.test_service.activate": { "owner": "default", "value": true }, - "services.test.manage": { + "services.test_service.manage": { "owner": "default", "value": true } diff --git a/tests/dictionaries/01base_file_include_content/tiramisu/base.py b/tests/dictionaries/01base_file_include_content/tiramisu/base.py index 0c9dc346..5fa72c97 100644 --- a/tests/dictionaries/01base_file_include_content/tiramisu/base.py +++ b/tests/dictionaries/01base_file_include_content/tiramisu/base.py @@ -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_16 = BoolOption(name="activate", doc="activate", 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_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, option_4]) diff --git a/tests/dictionaries/01base_file_include_name/makedict/after.json b/tests/dictionaries/01base_file_include_name/makedict/after.json index 0f9e1770..75db70c3 100644 --- a/tests/dictionaries/01base_file_include_name/makedict/after.json +++ b/tests/dictionaries/01base_file_include_name/makedict/after.json @@ -3,35 +3,35 @@ "owner": "default", "value": "non" }, - "services.test.files.file.name": { + "services.test_service.files.file.name": { "owner": "default", "value": "/etc/file" }, - "services.test.files.file.activate": { + "services.test_service.files.file.activate": { "owner": "default", "value": true }, - "services.test.files.file2.name": { + "services.test_service.files.file2.name": { "owner": "default", "value": "/etc/file2" }, - "services.test.files.file2.activate": { + "services.test_service.files.file2.activate": { "owner": "default", "value": true }, - "services.test.files.incfile.name": { + "services.test_service.files.incfile.name": { "owner": "default", "value": "/etc/dir/incfile" }, - "services.test.files.incfile.activate": { + "services.test_service.files.incfile.activate": { "owner": "default", "value": true }, - "services.test.activate": { + "services.test_service.activate": { "owner": "default", "value": true }, - "services.test.manage": { + "services.test_service.manage": { "owner": "default", "value": true } diff --git a/tests/dictionaries/01base_file_include_name/makedict/base.json b/tests/dictionaries/01base_file_include_name/makedict/base.json index 68409c43..cc167d1a 100644 --- a/tests/dictionaries/01base_file_include_name/makedict/base.json +++ b/tests/dictionaries/01base_file_include_name/makedict/base.json @@ -1,11 +1,11 @@ { "rougail.general.mode_conteneur_actif": "non", - "services.test.files.file.name": "/etc/file", - "services.test.files.file.activate": true, - "services.test.files.file2.name": "/etc/file2", - "services.test.files.file2.activate": true, - "services.test.files.incfile.name": "/etc/dir/incfile", - "services.test.files.incfile.activate": true, - "services.test.activate": true, - "services.test.manage": true + "services.test_service.files.file.name": "/etc/file", + "services.test_service.files.file.activate": true, + "services.test_service.files.file2.name": "/etc/file2", + "services.test_service.files.file2.activate": true, + "services.test_service.files.incfile.name": "/etc/dir/incfile", + "services.test_service.files.incfile.activate": true, + "services.test_service.activate": true, + "services.test_service.manage": true } diff --git a/tests/dictionaries/01base_file_include_name/makedict/before.json b/tests/dictionaries/01base_file_include_name/makedict/before.json index 0f9e1770..75db70c3 100644 --- a/tests/dictionaries/01base_file_include_name/makedict/before.json +++ b/tests/dictionaries/01base_file_include_name/makedict/before.json @@ -3,35 +3,35 @@ "owner": "default", "value": "non" }, - "services.test.files.file.name": { + "services.test_service.files.file.name": { "owner": "default", "value": "/etc/file" }, - "services.test.files.file.activate": { + "services.test_service.files.file.activate": { "owner": "default", "value": true }, - "services.test.files.file2.name": { + "services.test_service.files.file2.name": { "owner": "default", "value": "/etc/file2" }, - "services.test.files.file2.activate": { + "services.test_service.files.file2.activate": { "owner": "default", "value": true }, - "services.test.files.incfile.name": { + "services.test_service.files.incfile.name": { "owner": "default", "value": "/etc/dir/incfile" }, - "services.test.files.incfile.activate": { + "services.test_service.files.incfile.activate": { "owner": "default", "value": true }, - "services.test.activate": { + "services.test_service.activate": { "owner": "default", "value": true }, - "services.test.manage": { + "services.test_service.manage": { "owner": "default", "value": true } diff --git a/tests/dictionaries/01base_file_include_name/tiramisu/base.py b/tests/dictionaries/01base_file_include_name/tiramisu/base.py index 7ac27535..b9b8c2e1 100644 --- a/tests/dictionaries/01base_file_include_name/tiramisu/base.py +++ b/tests/dictionaries/01base_file_include_name/tiramisu/base.py @@ -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_16 = BoolOption(name="activate", doc="activate", 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_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, option_4]) diff --git a/tests/dictionaries/01base_file_owner/makedict/after.json b/tests/dictionaries/01base_file_owner/makedict/after.json index 60a3f954..fbf6109c 100644 --- a/tests/dictionaries/01base_file_owner/makedict/after.json +++ b/tests/dictionaries/01base_file_owner/makedict/after.json @@ -3,43 +3,43 @@ "owner": "default", "value": "non" }, - "services.test.files.file.group": { + "services.test_service.files.file.group": { "owner": "default", "value": "nobody" }, - "services.test.files.file.name": { + "services.test_service.files.file.name": { "owner": "default", "value": "/etc/file" }, - "services.test.files.file.owner": { + "services.test_service.files.file.owner": { "owner": "default", "value": "nobody" }, - "services.test.files.file.activate": { + "services.test_service.files.file.activate": { "owner": "default", "value": true }, - "services.test.files.file2.group": { + "services.test_service.files.file2.group": { "owner": "default", "value": "nobody" }, - "services.test.files.file2.name": { + "services.test_service.files.file2.name": { "owner": "default", "value": "/etc/file2" }, - "services.test.files.file2.owner": { + "services.test_service.files.file2.owner": { "owner": "default", "value": "nobody" }, - "services.test.files.file2.activate": { + "services.test_service.files.file2.activate": { "owner": "default", "value": true }, - "services.test.activate": { + "services.test_service.activate": { "owner": "default", "value": true }, - "services.test.manage": { + "services.test_service.manage": { "owner": "default", "value": true } diff --git a/tests/dictionaries/01base_file_owner/makedict/base.json b/tests/dictionaries/01base_file_owner/makedict/base.json index 870ca427..63657a51 100644 --- a/tests/dictionaries/01base_file_owner/makedict/base.json +++ b/tests/dictionaries/01base_file_owner/makedict/base.json @@ -1,13 +1,13 @@ { "rougail.general.mode_conteneur_actif": "non", - "services.test.files.file.group": "nobody", - "services.test.files.file.name": "/etc/file", - "services.test.files.file.owner": "nobody", - "services.test.files.file.activate": true, - "services.test.files.file2.group": "nobody", - "services.test.files.file2.name": "/etc/file2", - "services.test.files.file2.owner": "nobody", - "services.test.files.file2.activate": true, - "services.test.activate": true, - "services.test.manage": true + "services.test_service.files.file.group": "nobody", + "services.test_service.files.file.name": "/etc/file", + "services.test_service.files.file.owner": "nobody", + "services.test_service.files.file.activate": true, + "services.test_service.files.file2.group": "nobody", + "services.test_service.files.file2.name": "/etc/file2", + "services.test_service.files.file2.owner": "nobody", + "services.test_service.files.file2.activate": true, + "services.test_service.activate": true, + "services.test_service.manage": true } diff --git a/tests/dictionaries/01base_file_owner/makedict/before.json b/tests/dictionaries/01base_file_owner/makedict/before.json index 60a3f954..fbf6109c 100644 --- a/tests/dictionaries/01base_file_owner/makedict/before.json +++ b/tests/dictionaries/01base_file_owner/makedict/before.json @@ -3,43 +3,43 @@ "owner": "default", "value": "non" }, - "services.test.files.file.group": { + "services.test_service.files.file.group": { "owner": "default", "value": "nobody" }, - "services.test.files.file.name": { + "services.test_service.files.file.name": { "owner": "default", "value": "/etc/file" }, - "services.test.files.file.owner": { + "services.test_service.files.file.owner": { "owner": "default", "value": "nobody" }, - "services.test.files.file.activate": { + "services.test_service.files.file.activate": { "owner": "default", "value": true }, - "services.test.files.file2.group": { + "services.test_service.files.file2.group": { "owner": "default", "value": "nobody" }, - "services.test.files.file2.name": { + "services.test_service.files.file2.name": { "owner": "default", "value": "/etc/file2" }, - "services.test.files.file2.owner": { + "services.test_service.files.file2.owner": { "owner": "default", "value": "nobody" }, - "services.test.files.file2.activate": { + "services.test_service.files.file2.activate": { "owner": "default", "value": true }, - "services.test.activate": { + "services.test_service.activate": { "owner": "default", "value": true }, - "services.test.manage": { + "services.test_service.manage": { "owner": "default", "value": true } diff --git a/tests/dictionaries/01base_file_owner/tiramisu/base.py b/tests/dictionaries/01base_file_owner/tiramisu/base.py index a321c2ad..ac99ffc0 100644 --- a/tests/dictionaries/01base_file_owner/tiramisu/base.py +++ b/tests/dictionaries/01base_file_owner/tiramisu/base.py @@ -33,6 +33,6 @@ option_12.impl_set_information('source', "file2") option_6 = OptionDescription(name="files", doc="files", children=[option_7, option_12]) option_17 = BoolOption(name="activate", doc="activate", 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_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, option_4]) diff --git a/tests/dictionaries/01base_file_owner_variable/makedict/after.json b/tests/dictionaries/01base_file_owner_variable/makedict/after.json index 99889bce..cbf7345b 100644 --- a/tests/dictionaries/01base_file_owner_variable/makedict/after.json +++ b/tests/dictionaries/01base_file_owner_variable/makedict/after.json @@ -11,43 +11,43 @@ "owner": "default", "value": "nobody" }, - "services.test.files.file.group": { + "services.test_service.files.file.group": { "owner": "default", "value": "nobody" }, - "services.test.files.file.name": { + "services.test_service.files.file.name": { "owner": "default", "value": "/etc/file" }, - "services.test.files.file.owner": { + "services.test_service.files.file.owner": { "owner": "default", "value": "nobody" }, - "services.test.files.file.activate": { + "services.test_service.files.file.activate": { "owner": "default", "value": true }, - "services.test.files.file2.group": { + "services.test_service.files.file2.group": { "owner": "default", "value": "nobody" }, - "services.test.files.file2.name": { + "services.test_service.files.file2.name": { "owner": "default", "value": "/etc/file2" }, - "services.test.files.file2.owner": { + "services.test_service.files.file2.owner": { "owner": "default", "value": "nobody" }, - "services.test.files.file2.activate": { + "services.test_service.files.file2.activate": { "owner": "default", "value": true }, - "services.test.activate": { + "services.test_service.activate": { "owner": "default", "value": true }, - "services.test.manage": { + "services.test_service.manage": { "owner": "default", "value": true } diff --git a/tests/dictionaries/01base_file_owner_variable/makedict/base.json b/tests/dictionaries/01base_file_owner_variable/makedict/base.json index b586a77c..e9797c04 100644 --- a/tests/dictionaries/01base_file_owner_variable/makedict/base.json +++ b/tests/dictionaries/01base_file_owner_variable/makedict/base.json @@ -2,14 +2,14 @@ "rougail.general.mode_conteneur_actif": "non", "rougail.general.owner": "nobody", "rougail.general.group": "nobody", - "services.test.files.file.group": "nobody", - "services.test.files.file.name": "/etc/file", - "services.test.files.file.owner": "nobody", - "services.test.files.file.activate": true, - "services.test.files.file2.group": "nobody", - "services.test.files.file2.name": "/etc/file2", - "services.test.files.file2.owner": "nobody", - "services.test.files.file2.activate": true, - "services.test.activate": true, - "services.test.manage": true + "services.test_service.files.file.group": "nobody", + "services.test_service.files.file.name": "/etc/file", + "services.test_service.files.file.owner": "nobody", + "services.test_service.files.file.activate": true, + "services.test_service.files.file2.group": "nobody", + "services.test_service.files.file2.name": "/etc/file2", + "services.test_service.files.file2.owner": "nobody", + "services.test_service.files.file2.activate": true, + "services.test_service.activate": true, + "services.test_service.manage": true } diff --git a/tests/dictionaries/01base_file_owner_variable/makedict/before.json b/tests/dictionaries/01base_file_owner_variable/makedict/before.json index 99889bce..cbf7345b 100644 --- a/tests/dictionaries/01base_file_owner_variable/makedict/before.json +++ b/tests/dictionaries/01base_file_owner_variable/makedict/before.json @@ -11,43 +11,43 @@ "owner": "default", "value": "nobody" }, - "services.test.files.file.group": { + "services.test_service.files.file.group": { "owner": "default", "value": "nobody" }, - "services.test.files.file.name": { + "services.test_service.files.file.name": { "owner": "default", "value": "/etc/file" }, - "services.test.files.file.owner": { + "services.test_service.files.file.owner": { "owner": "default", "value": "nobody" }, - "services.test.files.file.activate": { + "services.test_service.files.file.activate": { "owner": "default", "value": true }, - "services.test.files.file2.group": { + "services.test_service.files.file2.group": { "owner": "default", "value": "nobody" }, - "services.test.files.file2.name": { + "services.test_service.files.file2.name": { "owner": "default", "value": "/etc/file2" }, - "services.test.files.file2.owner": { + "services.test_service.files.file2.owner": { "owner": "default", "value": "nobody" }, - "services.test.files.file2.activate": { + "services.test_service.files.file2.activate": { "owner": "default", "value": true }, - "services.test.activate": { + "services.test_service.activate": { "owner": "default", "value": true }, - "services.test.manage": { + "services.test_service.manage": { "owner": "default", "value": true } diff --git a/tests/dictionaries/01base_file_owner_variable/tiramisu/base.py b/tests/dictionaries/01base_file_owner_variable/tiramisu/base.py index b1ba60bd..49886841 100644 --- a/tests/dictionaries/01base_file_owner_variable/tiramisu/base.py +++ b/tests/dictionaries/01base_file_owner_variable/tiramisu/base.py @@ -35,6 +35,6 @@ option_14.impl_set_information('source', "file2") option_8 = OptionDescription(name="files", doc="files", children=[option_9, option_14]) option_19 = BoolOption(name="activate", doc="activate", 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_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, option_6]) diff --git a/tests/dictionaries/01base_file_patch/makedict/after.json b/tests/dictionaries/01base_file_patch/makedict/after.json index c8edf346..70ca0c16 100644 --- a/tests/dictionaries/01base_file_patch/makedict/after.json +++ b/tests/dictionaries/01base_file_patch/makedict/after.json @@ -3,27 +3,27 @@ "owner": "default", "value": "non" }, - "services.test.files.file.name": { + "services.test_service.files.file.name": { "owner": "default", "value": "/etc/file" }, - "services.test.files.file.activate": { + "services.test_service.files.file.activate": { "owner": "default", "value": true }, - "services.test.files.file2.name": { + "services.test_service.files.file2.name": { "owner": "default", "value": "/etc/file2" }, - "services.test.files.file2.activate": { + "services.test_service.files.file2.activate": { "owner": "default", "value": true }, - "services.test.activate": { + "services.test_service.activate": { "owner": "default", "value": true }, - "services.test.manage": { + "services.test_service.manage": { "owner": "default", "value": true } diff --git a/tests/dictionaries/01base_file_patch/makedict/base.json b/tests/dictionaries/01base_file_patch/makedict/base.json index c9048468..8f8bc2b3 100644 --- a/tests/dictionaries/01base_file_patch/makedict/base.json +++ b/tests/dictionaries/01base_file_patch/makedict/base.json @@ -1,9 +1,9 @@ { "rougail.general.mode_conteneur_actif": "non", - "services.test.files.file.name": "/etc/file", - "services.test.files.file.activate": true, - "services.test.files.file2.name": "/etc/file2", - "services.test.files.file2.activate": true, - "services.test.activate": true, - "services.test.manage": true + "services.test_service.files.file.name": "/etc/file", + "services.test_service.files.file.activate": true, + "services.test_service.files.file2.name": "/etc/file2", + "services.test_service.files.file2.activate": true, + "services.test_service.activate": true, + "services.test_service.manage": true } diff --git a/tests/dictionaries/01base_file_patch/makedict/before.json b/tests/dictionaries/01base_file_patch/makedict/before.json index c8edf346..70ca0c16 100644 --- a/tests/dictionaries/01base_file_patch/makedict/before.json +++ b/tests/dictionaries/01base_file_patch/makedict/before.json @@ -3,27 +3,27 @@ "owner": "default", "value": "non" }, - "services.test.files.file.name": { + "services.test_service.files.file.name": { "owner": "default", "value": "/etc/file" }, - "services.test.files.file.activate": { + "services.test_service.files.file.activate": { "owner": "default", "value": true }, - "services.test.files.file2.name": { + "services.test_service.files.file2.name": { "owner": "default", "value": "/etc/file2" }, - "services.test.files.file2.activate": { + "services.test_service.files.file2.activate": { "owner": "default", "value": true }, - "services.test.activate": { + "services.test_service.activate": { "owner": "default", "value": true }, - "services.test.manage": { + "services.test_service.manage": { "owner": "default", "value": true } diff --git a/tests/dictionaries/01base_file_patch/tiramisu/base.py b/tests/dictionaries/01base_file_patch/tiramisu/base.py index abf86944..59673559 100644 --- a/tests/dictionaries/01base_file_patch/tiramisu/base.py +++ b/tests/dictionaries/01base_file_patch/tiramisu/base.py @@ -29,6 +29,6 @@ option_10.impl_set_information('source', "file2") option_6 = OptionDescription(name="files", doc="files", children=[option_7, option_10]) option_13 = BoolOption(name="activate", doc="activate", 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_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, option_4]) diff --git a/tests/dictionaries/01base_file_utfchar/makedict/after.json b/tests/dictionaries/01base_file_utfchar/makedict/after.json index 443ae742..39356ec4 100644 --- a/tests/dictionaries/01base_file_utfchar/makedict/after.json +++ b/tests/dictionaries/01base_file_utfchar/makedict/after.json @@ -3,27 +3,27 @@ "owner": "default", "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", "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", "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", "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", "value": true }, - "services.test.activate": { + "services.test_service.activate": { "owner": "default", "value": true }, - "services.test.manage": { + "services.test_service.manage": { "owner": "default", "value": true } diff --git a/tests/dictionaries/01base_file_utfchar/makedict/base.json b/tests/dictionaries/01base_file_utfchar/makedict/base.json index 2ae7cd2f..3e40fcac 100644 --- a/tests/dictionaries/01base_file_utfchar/makedict/base.json +++ b/tests/dictionaries/01base_file_utfchar/makedict/base.json @@ -1,9 +1,9 @@ { "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.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.files.systemd_makefs@dev_disk_by\\x2dpartlabel2.activate": true, - "services.test.activate": true, - "services.test.manage": true + "services.test_service.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.activate": true, + "services.test_service.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.activate": true, + "services.test_service.activate": true, + "services.test_service.manage": true } diff --git a/tests/dictionaries/01base_file_utfchar/makedict/before.json b/tests/dictionaries/01base_file_utfchar/makedict/before.json index 443ae742..39356ec4 100644 --- a/tests/dictionaries/01base_file_utfchar/makedict/before.json +++ b/tests/dictionaries/01base_file_utfchar/makedict/before.json @@ -3,27 +3,27 @@ "owner": "default", "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", "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", "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", "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", "value": true }, - "services.test.activate": { + "services.test_service.activate": { "owner": "default", "value": true }, - "services.test.manage": { + "services.test_service.manage": { "owner": "default", "value": true } diff --git a/tests/dictionaries/01base_file_utfchar/tiramisu/base.py b/tests/dictionaries/01base_file_utfchar/tiramisu/base.py index f8f38369..2a073934 100644 --- a/tests/dictionaries/01base_file_utfchar/tiramisu/base.py +++ b/tests/dictionaries/01base_file_utfchar/tiramisu/base.py @@ -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_13 = BoolOption(name="activate", doc="activate", 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_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, option_4]) diff --git a/tests/dictionaries/10load_disabled_if_in_multi_param/makedict/after.json b/tests/dictionaries/10load_disabled_if_in_multi_param/makedict/after.json index 465294dd..30cd5f24 100644 --- a/tests/dictionaries/10load_disabled_if_in_multi_param/makedict/after.json +++ b/tests/dictionaries/10load_disabled_if_in_multi_param/makedict/after.json @@ -11,19 +11,19 @@ "owner": "default", "value": "non" }, - "services.test.files.file1.name": { + "services.test_service.files.file1.name": { "owner": "default", "value": "/tmp/file1" }, - "services.test.files.file1.activate": { + "services.test_service.files.file1.activate": { "owner": "default", "value": true }, - "services.test.activate": { + "services.test_service.activate": { "owner": "default", "value": true }, - "services.test.manage": { + "services.test_service.manage": { "owner": "default", "value": true } diff --git a/tests/dictionaries/10load_disabled_if_in_multi_param/makedict/base.json b/tests/dictionaries/10load_disabled_if_in_multi_param/makedict/base.json index f4ceb046..c181f1b9 100644 --- a/tests/dictionaries/10load_disabled_if_in_multi_param/makedict/base.json +++ b/tests/dictionaries/10load_disabled_if_in_multi_param/makedict/base.json @@ -2,8 +2,8 @@ "rougail.general.condition": "non", "rougail.general.mode_conteneur_actif": "non", "rougail.general.mode_conteneur_actif2": "non", - "services.test.files.file1.name": "/tmp/file1", - "services.test.files.file1.activate": true, - "services.test.activate": true, - "services.test.manage": true + "services.test_service.files.file1.name": "/tmp/file1", + "services.test_service.files.file1.activate": true, + "services.test_service.activate": true, + "services.test_service.manage": true } diff --git a/tests/dictionaries/10load_disabled_if_in_multi_param/makedict/before.json b/tests/dictionaries/10load_disabled_if_in_multi_param/makedict/before.json index 465294dd..30cd5f24 100644 --- a/tests/dictionaries/10load_disabled_if_in_multi_param/makedict/before.json +++ b/tests/dictionaries/10load_disabled_if_in_multi_param/makedict/before.json @@ -11,19 +11,19 @@ "owner": "default", "value": "non" }, - "services.test.files.file1.name": { + "services.test_service.files.file1.name": { "owner": "default", "value": "/tmp/file1" }, - "services.test.files.file1.activate": { + "services.test_service.files.file1.activate": { "owner": "default", "value": true }, - "services.test.activate": { + "services.test_service.activate": { "owner": "default", "value": true }, - "services.test.manage": { + "services.test_service.manage": { "owner": "default", "value": true } diff --git a/tests/dictionaries/10load_disabled_if_in_multi_param/tiramisu/base.py b/tests/dictionaries/10load_disabled_if_in_multi_param/tiramisu/base.py index 8a1b6960..31aa43f8 100644 --- a/tests/dictionaries/10load_disabled_if_in_multi_param/tiramisu/base.py +++ b/tests/dictionaries/10load_disabled_if_in_multi_param/tiramisu/base.py @@ -26,6 +26,6 @@ option_9.impl_set_information('source', "file1") option_8 = OptionDescription(name="files", doc="files", children=[option_9]) option_12 = BoolOption(name="activate", doc="activate", 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_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, option_6]) diff --git a/tests/dictionaries/10load_disabled_if_in_multi_param2/makedict/after.json b/tests/dictionaries/10load_disabled_if_in_multi_param2/makedict/after.json index c9549083..b7993113 100644 --- a/tests/dictionaries/10load_disabled_if_in_multi_param2/makedict/after.json +++ b/tests/dictionaries/10load_disabled_if_in_multi_param2/makedict/after.json @@ -11,19 +11,19 @@ "owner": "default", "value": "no" }, - "services.test.files.file1.name": { + "services.test_service.files.file1.name": { "owner": "default", "value": "/tmp/file1" }, - "services.test.files.file1.activate": { + "services.test_service.files.file1.activate": { "owner": "default", "value": true }, - "services.test.activate": { + "services.test_service.activate": { "owner": "default", "value": true }, - "services.test.manage": { + "services.test_service.manage": { "owner": "default", "value": true } diff --git a/tests/dictionaries/10load_disabled_if_in_multi_param2/makedict/base.json b/tests/dictionaries/10load_disabled_if_in_multi_param2/makedict/base.json index 16da02ea..d99b2c90 100644 --- a/tests/dictionaries/10load_disabled_if_in_multi_param2/makedict/base.json +++ b/tests/dictionaries/10load_disabled_if_in_multi_param2/makedict/base.json @@ -2,8 +2,8 @@ "rougail.general.condition": "no", "rougail.general.condition2": "no", "rougail.general.test_variable": "no", - "services.test.files.file1.name": "/tmp/file1", - "services.test.files.file1.activate": true, - "services.test.activate": true, - "services.test.manage": true + "services.test_service.files.file1.name": "/tmp/file1", + "services.test_service.files.file1.activate": true, + "services.test_service.activate": true, + "services.test_service.manage": true } diff --git a/tests/dictionaries/10load_disabled_if_in_multi_param2/makedict/before.json b/tests/dictionaries/10load_disabled_if_in_multi_param2/makedict/before.json index c9549083..b7993113 100644 --- a/tests/dictionaries/10load_disabled_if_in_multi_param2/makedict/before.json +++ b/tests/dictionaries/10load_disabled_if_in_multi_param2/makedict/before.json @@ -11,19 +11,19 @@ "owner": "default", "value": "no" }, - "services.test.files.file1.name": { + "services.test_service.files.file1.name": { "owner": "default", "value": "/tmp/file1" }, - "services.test.files.file1.activate": { + "services.test_service.files.file1.activate": { "owner": "default", "value": true }, - "services.test.activate": { + "services.test_service.activate": { "owner": "default", "value": true }, - "services.test.manage": { + "services.test_service.manage": { "owner": "default", "value": true } diff --git a/tests/dictionaries/10load_disabled_if_in_multi_param2/tiramisu/base.py b/tests/dictionaries/10load_disabled_if_in_multi_param2/tiramisu/base.py index d729b6b6..5863b74b 100644 --- a/tests/dictionaries/10load_disabled_if_in_multi_param2/tiramisu/base.py +++ b/tests/dictionaries/10load_disabled_if_in_multi_param2/tiramisu/base.py @@ -26,6 +26,6 @@ option_9.impl_set_information('source', "file1") option_8 = OptionDescription(name="files", doc="files", children=[option_9]) option_12 = BoolOption(name="activate", doc="activate", 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_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, option_6]) diff --git a/tests/dictionaries/10load_disabled_if_in_multi_param3/makedict/after.json b/tests/dictionaries/10load_disabled_if_in_multi_param3/makedict/after.json index fd86985c..32acecbc 100644 --- a/tests/dictionaries/10load_disabled_if_in_multi_param3/makedict/after.json +++ b/tests/dictionaries/10load_disabled_if_in_multi_param3/makedict/after.json @@ -7,19 +7,19 @@ "owner": "default", "value": "no" }, - "services.test.files.file1.name": { + "services.test_service.files.file1.name": { "owner": "default", "value": "/tmp/file1" }, - "services.test.files.file1.activate": { + "services.test_service.files.file1.activate": { "owner": "default", "value": false }, - "services.test.activate": { + "services.test_service.activate": { "owner": "default", "value": true }, - "services.test.manage": { + "services.test_service.manage": { "owner": "default", "value": true } diff --git a/tests/dictionaries/10load_disabled_if_in_multi_param3/makedict/base.json b/tests/dictionaries/10load_disabled_if_in_multi_param3/makedict/base.json index 2d19d40a..cfcd8f62 100644 --- a/tests/dictionaries/10load_disabled_if_in_multi_param3/makedict/base.json +++ b/tests/dictionaries/10load_disabled_if_in_multi_param3/makedict/base.json @@ -1,8 +1,8 @@ { "rougail.general.condition": "no", "rougail.general.condition2": "no", - "services.test.files.file1.name": "/tmp/file1", - "services.test.files.file1.activate": false, - "services.test.activate": true, - "services.test.manage": true + "services.test_service.files.file1.name": "/tmp/file1", + "services.test_service.files.file1.activate": false, + "services.test_service.activate": true, + "services.test_service.manage": true } diff --git a/tests/dictionaries/10load_disabled_if_in_multi_param3/makedict/before.json b/tests/dictionaries/10load_disabled_if_in_multi_param3/makedict/before.json index fd86985c..32acecbc 100644 --- a/tests/dictionaries/10load_disabled_if_in_multi_param3/makedict/before.json +++ b/tests/dictionaries/10load_disabled_if_in_multi_param3/makedict/before.json @@ -7,19 +7,19 @@ "owner": "default", "value": "no" }, - "services.test.files.file1.name": { + "services.test_service.files.file1.name": { "owner": "default", "value": "/tmp/file1" }, - "services.test.files.file1.activate": { + "services.test_service.files.file1.activate": { "owner": "default", "value": false }, - "services.test.activate": { + "services.test_service.activate": { "owner": "default", "value": true }, - "services.test.manage": { + "services.test_service.manage": { "owner": "default", "value": true } diff --git a/tests/dictionaries/10load_disabled_if_in_multi_param3/tiramisu/base.py b/tests/dictionaries/10load_disabled_if_in_multi_param3/tiramisu/base.py index 6d74135c..fe3a571b 100644 --- a/tests/dictionaries/10load_disabled_if_in_multi_param3/tiramisu/base.py +++ b/tests/dictionaries/10load_disabled_if_in_multi_param3/tiramisu/base.py @@ -26,6 +26,6 @@ option_9.impl_set_information('source', "file1") option_8 = OptionDescription(name="files", doc="files", children=[option_9]) option_12 = BoolOption(name="activate", doc="activate", 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_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, option_6]) diff --git a/tests/dictionaries/10load_disabled_if_in_multi_param4/makedict/after.json b/tests/dictionaries/10load_disabled_if_in_multi_param4/makedict/after.json index 15742a7a..24bc818c 100644 --- a/tests/dictionaries/10load_disabled_if_in_multi_param4/makedict/after.json +++ b/tests/dictionaries/10load_disabled_if_in_multi_param4/makedict/after.json @@ -7,19 +7,19 @@ "owner": "default", "value": "no" }, - "services.test.files.file1.name": { + "services.test_service.files.file1.name": { "owner": "default", "value": "/tmp/file1" }, - "services.test.files.file1.activate": { + "services.test_service.files.file1.activate": { "owner": "default", "value": true }, - "services.test.activate": { + "services.test_service.activate": { "owner": "default", "value": true }, - "services.test.manage": { + "services.test_service.manage": { "owner": "default", "value": true } diff --git a/tests/dictionaries/10load_disabled_if_in_multi_param4/makedict/base.json b/tests/dictionaries/10load_disabled_if_in_multi_param4/makedict/base.json index 728fe8b4..db5a7924 100644 --- a/tests/dictionaries/10load_disabled_if_in_multi_param4/makedict/base.json +++ b/tests/dictionaries/10load_disabled_if_in_multi_param4/makedict/base.json @@ -1,8 +1,8 @@ { "rougail.general.condition": "yes", "rougail.general.condition2": "no", - "services.test.files.file1.name": "/tmp/file1", - "services.test.files.file1.activate": true, - "services.test.activate": true, - "services.test.manage": true + "services.test_service.files.file1.name": "/tmp/file1", + "services.test_service.files.file1.activate": true, + "services.test_service.activate": true, + "services.test_service.manage": true } diff --git a/tests/dictionaries/10load_disabled_if_in_multi_param4/makedict/before.json b/tests/dictionaries/10load_disabled_if_in_multi_param4/makedict/before.json index 15742a7a..24bc818c 100644 --- a/tests/dictionaries/10load_disabled_if_in_multi_param4/makedict/before.json +++ b/tests/dictionaries/10load_disabled_if_in_multi_param4/makedict/before.json @@ -7,19 +7,19 @@ "owner": "default", "value": "no" }, - "services.test.files.file1.name": { + "services.test_service.files.file1.name": { "owner": "default", "value": "/tmp/file1" }, - "services.test.files.file1.activate": { + "services.test_service.files.file1.activate": { "owner": "default", "value": true }, - "services.test.activate": { + "services.test_service.activate": { "owner": "default", "value": true }, - "services.test.manage": { + "services.test_service.manage": { "owner": "default", "value": true } diff --git a/tests/dictionaries/10load_disabled_if_in_multi_param4/tiramisu/base.py b/tests/dictionaries/10load_disabled_if_in_multi_param4/tiramisu/base.py index 5389cf83..32a78f6b 100644 --- a/tests/dictionaries/10load_disabled_if_in_multi_param4/tiramisu/base.py +++ b/tests/dictionaries/10load_disabled_if_in_multi_param4/tiramisu/base.py @@ -26,6 +26,6 @@ option_9.impl_set_information('source', "file1") option_8 = OptionDescription(name="files", doc="files", children=[option_9]) option_12 = BoolOption(name="activate", doc="activate", 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_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, option_6]) diff --git a/tests/dictionaries/10load_disabled_if_in_multi_param5/makedict/after.json b/tests/dictionaries/10load_disabled_if_in_multi_param5/makedict/after.json index dfe546f1..2bf4f8be 100644 --- a/tests/dictionaries/10load_disabled_if_in_multi_param5/makedict/after.json +++ b/tests/dictionaries/10load_disabled_if_in_multi_param5/makedict/after.json @@ -7,19 +7,19 @@ "owner": "default", "value": "yes" }, - "services.test.files.file1.name": { + "services.test_service.files.file1.name": { "owner": "default", "value": "/tmp/file1" }, - "services.test.files.file1.activate": { + "services.test_service.files.file1.activate": { "owner": "default", "value": false }, - "services.test.activate": { + "services.test_service.activate": { "owner": "default", "value": true }, - "services.test.manage": { + "services.test_service.manage": { "owner": "default", "value": true } diff --git a/tests/dictionaries/10load_disabled_if_in_multi_param5/makedict/base.json b/tests/dictionaries/10load_disabled_if_in_multi_param5/makedict/base.json index 3c256d76..84715fd2 100644 --- a/tests/dictionaries/10load_disabled_if_in_multi_param5/makedict/base.json +++ b/tests/dictionaries/10load_disabled_if_in_multi_param5/makedict/base.json @@ -1,8 +1,8 @@ { "rougail.general.condition": "yes", "rougail.general.condition2": "yes", - "services.test.files.file1.name": "/tmp/file1", - "services.test.files.file1.activate": false, - "services.test.activate": true, - "services.test.manage": true + "services.test_service.files.file1.name": "/tmp/file1", + "services.test_service.files.file1.activate": false, + "services.test_service.activate": true, + "services.test_service.manage": true } diff --git a/tests/dictionaries/10load_disabled_if_in_multi_param5/makedict/before.json b/tests/dictionaries/10load_disabled_if_in_multi_param5/makedict/before.json index dfe546f1..2bf4f8be 100644 --- a/tests/dictionaries/10load_disabled_if_in_multi_param5/makedict/before.json +++ b/tests/dictionaries/10load_disabled_if_in_multi_param5/makedict/before.json @@ -7,19 +7,19 @@ "owner": "default", "value": "yes" }, - "services.test.files.file1.name": { + "services.test_service.files.file1.name": { "owner": "default", "value": "/tmp/file1" }, - "services.test.files.file1.activate": { + "services.test_service.files.file1.activate": { "owner": "default", "value": false }, - "services.test.activate": { + "services.test_service.activate": { "owner": "default", "value": true }, - "services.test.manage": { + "services.test_service.manage": { "owner": "default", "value": true } diff --git a/tests/dictionaries/10load_disabled_if_in_multi_param5/tiramisu/base.py b/tests/dictionaries/10load_disabled_if_in_multi_param5/tiramisu/base.py index bd4f382c..35219a25 100644 --- a/tests/dictionaries/10load_disabled_if_in_multi_param5/tiramisu/base.py +++ b/tests/dictionaries/10load_disabled_if_in_multi_param5/tiramisu/base.py @@ -26,6 +26,6 @@ option_9.impl_set_information('source', "file1") option_8 = OptionDescription(name="files", doc="files", children=[option_9]) option_12 = BoolOption(name="activate", doc="activate", 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_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, option_6]) diff --git a/tests/dictionaries/10load_disabled_if_in_multi_param6/makedict/after.json b/tests/dictionaries/10load_disabled_if_in_multi_param6/makedict/after.json index 1085d3ec..cbc8c9cb 100644 --- a/tests/dictionaries/10load_disabled_if_in_multi_param6/makedict/after.json +++ b/tests/dictionaries/10load_disabled_if_in_multi_param6/makedict/after.json @@ -7,19 +7,19 @@ "owner": "default", "value": "yes" }, - "services.test.files.file1.name": { + "services.test_service.files.file1.name": { "owner": "default", "value": "/tmp/file1" }, - "services.test.files.file1.activate": { + "services.test_service.files.file1.activate": { "owner": "default", "value": false }, - "services.test.activate": { + "services.test_service.activate": { "owner": "default", "value": true }, - "services.test.manage": { + "services.test_service.manage": { "owner": "default", "value": true } diff --git a/tests/dictionaries/10load_disabled_if_in_multi_param6/makedict/base.json b/tests/dictionaries/10load_disabled_if_in_multi_param6/makedict/base.json index 089759dc..83036daf 100644 --- a/tests/dictionaries/10load_disabled_if_in_multi_param6/makedict/base.json +++ b/tests/dictionaries/10load_disabled_if_in_multi_param6/makedict/base.json @@ -1,8 +1,8 @@ { "rougail.general.condition": "no", "rougail.general.condition2": "yes", - "services.test.files.file1.name": "/tmp/file1", - "services.test.files.file1.activate": false, - "services.test.activate": true, - "services.test.manage": true + "services.test_service.files.file1.name": "/tmp/file1", + "services.test_service.files.file1.activate": false, + "services.test_service.activate": true, + "services.test_service.manage": true } diff --git a/tests/dictionaries/10load_disabled_if_in_multi_param6/makedict/before.json b/tests/dictionaries/10load_disabled_if_in_multi_param6/makedict/before.json index 1085d3ec..cbc8c9cb 100644 --- a/tests/dictionaries/10load_disabled_if_in_multi_param6/makedict/before.json +++ b/tests/dictionaries/10load_disabled_if_in_multi_param6/makedict/before.json @@ -7,19 +7,19 @@ "owner": "default", "value": "yes" }, - "services.test.files.file1.name": { + "services.test_service.files.file1.name": { "owner": "default", "value": "/tmp/file1" }, - "services.test.files.file1.activate": { + "services.test_service.files.file1.activate": { "owner": "default", "value": false }, - "services.test.activate": { + "services.test_service.activate": { "owner": "default", "value": true }, - "services.test.manage": { + "services.test_service.manage": { "owner": "default", "value": true } diff --git a/tests/dictionaries/10load_disabled_if_in_multi_param6/tiramisu/base.py b/tests/dictionaries/10load_disabled_if_in_multi_param6/tiramisu/base.py index ac78a629..4212d9aa 100644 --- a/tests/dictionaries/10load_disabled_if_in_multi_param6/tiramisu/base.py +++ b/tests/dictionaries/10load_disabled_if_in_multi_param6/tiramisu/base.py @@ -26,6 +26,6 @@ option_9.impl_set_information('source', "file1") option_8 = OptionDescription(name="files", doc="files", children=[option_9]) option_12 = BoolOption(name="activate", doc="activate", 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_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, option_6]) diff --git a/tests/dictionaries/10load_disabled_if_in_multi_param_disabled/makedict/after.json b/tests/dictionaries/10load_disabled_if_in_multi_param_disabled/makedict/after.json index 3d60ca6a..41940194 100644 --- a/tests/dictionaries/10load_disabled_if_in_multi_param_disabled/makedict/after.json +++ b/tests/dictionaries/10load_disabled_if_in_multi_param_disabled/makedict/after.json @@ -3,19 +3,19 @@ "owner": "default", "value": "oui" }, - "services.test.files.file1.name": { + "services.test_service.files.file1.name": { "owner": "default", "value": "/tmp/file1" }, - "services.test.files.file1.activate": { + "services.test_service.files.file1.activate": { "owner": "default", "value": false }, - "services.test.activate": { + "services.test_service.activate": { "owner": "default", "value": true }, - "services.test.manage": { + "services.test_service.manage": { "owner": "default", "value": true } diff --git a/tests/dictionaries/10load_disabled_if_in_multi_param_disabled/makedict/base.json b/tests/dictionaries/10load_disabled_if_in_multi_param_disabled/makedict/base.json index 0190e501..0ff4587c 100644 --- a/tests/dictionaries/10load_disabled_if_in_multi_param_disabled/makedict/base.json +++ b/tests/dictionaries/10load_disabled_if_in_multi_param_disabled/makedict/base.json @@ -1,7 +1,7 @@ { "rougail.general.condition": "oui", - "services.test.files.file1.name": "/tmp/file1", - "services.test.files.file1.activate": false, - "services.test.activate": true, - "services.test.manage": true + "services.test_service.files.file1.name": "/tmp/file1", + "services.test_service.files.file1.activate": false, + "services.test_service.activate": true, + "services.test_service.manage": true } diff --git a/tests/dictionaries/10load_disabled_if_in_multi_param_disabled/makedict/before.json b/tests/dictionaries/10load_disabled_if_in_multi_param_disabled/makedict/before.json index 3d60ca6a..41940194 100644 --- a/tests/dictionaries/10load_disabled_if_in_multi_param_disabled/makedict/before.json +++ b/tests/dictionaries/10load_disabled_if_in_multi_param_disabled/makedict/before.json @@ -3,19 +3,19 @@ "owner": "default", "value": "oui" }, - "services.test.files.file1.name": { + "services.test_service.files.file1.name": { "owner": "default", "value": "/tmp/file1" }, - "services.test.files.file1.activate": { + "services.test_service.files.file1.activate": { "owner": "default", "value": false }, - "services.test.activate": { + "services.test_service.activate": { "owner": "default", "value": true }, - "services.test.manage": { + "services.test_service.manage": { "owner": "default", "value": true } diff --git a/tests/dictionaries/10load_disabled_if_in_multi_param_disabled/tiramisu/base.py b/tests/dictionaries/10load_disabled_if_in_multi_param_disabled/tiramisu/base.py index c1ac0e7b..8699233c 100644 --- a/tests/dictionaries/10load_disabled_if_in_multi_param_disabled/tiramisu/base.py +++ b/tests/dictionaries/10load_disabled_if_in_multi_param_disabled/tiramisu/base.py @@ -26,6 +26,6 @@ option_9.impl_set_information('source', "file1") option_8 = OptionDescription(name="files", doc="files", children=[option_9]) option_12 = BoolOption(name="activate", doc="activate", 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_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, option_6]) diff --git a/tests/dictionaries/10load_disabled_if_not_in_fallback/makedict/after.json b/tests/dictionaries/10load_disabled_if_not_in_fallback/makedict/after.json index 4fc26870..560f23c6 100644 --- a/tests/dictionaries/10load_disabled_if_not_in_fallback/makedict/after.json +++ b/tests/dictionaries/10load_disabled_if_not_in_fallback/makedict/after.json @@ -7,19 +7,19 @@ "owner": "default", "value": "no" }, - "services.test.files.file1.name": { + "services.test_service.files.file1.name": { "owner": "default", "value": "/tmp/file1" }, - "services.test.files.file1.activate": { + "services.test_service.files.file1.activate": { "owner": "default", "value": true }, - "services.test.activate": { + "services.test_service.activate": { "owner": "default", "value": true }, - "services.test.manage": { + "services.test_service.manage": { "owner": "default", "value": true } diff --git a/tests/dictionaries/10load_disabled_if_not_in_fallback/makedict/base.json b/tests/dictionaries/10load_disabled_if_not_in_fallback/makedict/base.json index 431665f1..4b01dd52 100644 --- a/tests/dictionaries/10load_disabled_if_not_in_fallback/makedict/base.json +++ b/tests/dictionaries/10load_disabled_if_not_in_fallback/makedict/base.json @@ -1,8 +1,8 @@ { "rougail.general.condition": "no", "rougail.general.disable_variable": "no", - "services.test.files.file1.name": "/tmp/file1", - "services.test.files.file1.activate": true, - "services.test.activate": true, - "services.test.manage": true + "services.test_service.files.file1.name": "/tmp/file1", + "services.test_service.files.file1.activate": true, + "services.test_service.activate": true, + "services.test_service.manage": true } diff --git a/tests/dictionaries/10load_disabled_if_not_in_fallback/makedict/before.json b/tests/dictionaries/10load_disabled_if_not_in_fallback/makedict/before.json index 4fc26870..560f23c6 100644 --- a/tests/dictionaries/10load_disabled_if_not_in_fallback/makedict/before.json +++ b/tests/dictionaries/10load_disabled_if_not_in_fallback/makedict/before.json @@ -7,19 +7,19 @@ "owner": "default", "value": "no" }, - "services.test.files.file1.name": { + "services.test_service.files.file1.name": { "owner": "default", "value": "/tmp/file1" }, - "services.test.files.file1.activate": { + "services.test_service.files.file1.activate": { "owner": "default", "value": true }, - "services.test.activate": { + "services.test_service.activate": { "owner": "default", "value": true }, - "services.test.manage": { + "services.test_service.manage": { "owner": "default", "value": true } diff --git a/tests/dictionaries/10load_disabled_if_not_in_fallback/tiramisu/base.py b/tests/dictionaries/10load_disabled_if_not_in_fallback/tiramisu/base.py index d9ef83d6..42e3ca89 100644 --- a/tests/dictionaries/10load_disabled_if_not_in_fallback/tiramisu/base.py +++ b/tests/dictionaries/10load_disabled_if_not_in_fallback/tiramisu/base.py @@ -25,6 +25,6 @@ option_8.impl_set_information('source', "file1") option_7 = OptionDescription(name="files", doc="files", children=[option_8]) option_11 = BoolOption(name="activate", doc="activate", 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_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, option_5]) diff --git a/tests/dictionaries/11disabled_if_in_filelist/makedict/after.json b/tests/dictionaries/11disabled_if_in_filelist/makedict/after.json index 14937b25..6ffeb240 100644 --- a/tests/dictionaries/11disabled_if_in_filelist/makedict/after.json +++ b/tests/dictionaries/11disabled_if_in_filelist/makedict/after.json @@ -11,19 +11,19 @@ "owner": "default", "value": true }, - "services.test.files.file.name": { + "services.test_service.files.file.name": { "owner": "default", "value": "/etc/file" }, - "services.test.files.file.activate": { + "services.test_service.files.file.activate": { "owner": "default", "value": true }, - "services.test.activate": { + "services.test_service.activate": { "owner": "default", "value": true }, - "services.test.manage": { + "services.test_service.manage": { "owner": "default", "value": true } diff --git a/tests/dictionaries/11disabled_if_in_filelist/makedict/base.json b/tests/dictionaries/11disabled_if_in_filelist/makedict/base.json index 05d18c18..16dcb103 100644 --- a/tests/dictionaries/11disabled_if_in_filelist/makedict/base.json +++ b/tests/dictionaries/11disabled_if_in_filelist/makedict/base.json @@ -2,8 +2,8 @@ "rougail.general.condition": "non", "rougail.general.mode_conteneur_actif": "non", "rougail.general.mode_conteneur_actif2": true, - "services.test.files.file.name": "/etc/file", - "services.test.files.file.activate": true, - "services.test.activate": true, - "services.test.manage": true + "services.test_service.files.file.name": "/etc/file", + "services.test_service.files.file.activate": true, + "services.test_service.activate": true, + "services.test_service.manage": true } diff --git a/tests/dictionaries/11disabled_if_in_filelist/makedict/before.json b/tests/dictionaries/11disabled_if_in_filelist/makedict/before.json index 14937b25..6ffeb240 100644 --- a/tests/dictionaries/11disabled_if_in_filelist/makedict/before.json +++ b/tests/dictionaries/11disabled_if_in_filelist/makedict/before.json @@ -11,19 +11,19 @@ "owner": "default", "value": true }, - "services.test.files.file.name": { + "services.test_service.files.file.name": { "owner": "default", "value": "/etc/file" }, - "services.test.files.file.activate": { + "services.test_service.files.file.activate": { "owner": "default", "value": true }, - "services.test.activate": { + "services.test_service.activate": { "owner": "default", "value": true }, - "services.test.manage": { + "services.test_service.manage": { "owner": "default", "value": true } diff --git a/tests/dictionaries/11disabled_if_in_filelist/tiramisu/base.py b/tests/dictionaries/11disabled_if_in_filelist/tiramisu/base.py index fe57005d..0731423d 100644 --- a/tests/dictionaries/11disabled_if_in_filelist/tiramisu/base.py +++ b/tests/dictionaries/11disabled_if_in_filelist/tiramisu/base.py @@ -26,6 +26,6 @@ option_9.impl_set_information('source', "file") option_8 = OptionDescription(name="files", doc="files", children=[option_9]) option_12 = BoolOption(name="activate", doc="activate", 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_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, option_6]) diff --git a/tests/dictionaries/11disabled_if_in_filelist_boolean/makedict/after.json b/tests/dictionaries/11disabled_if_in_filelist_boolean/makedict/after.json index 2d2b3390..fb118d0f 100644 --- a/tests/dictionaries/11disabled_if_in_filelist_boolean/makedict/after.json +++ b/tests/dictionaries/11disabled_if_in_filelist_boolean/makedict/after.json @@ -3,19 +3,19 @@ "owner": "default", "value": true }, - "services.test.files.file1.name": { + "services.test_service.files.file1.name": { "owner": "default", "value": "/tmp/file1" }, - "services.test.files.file1.activate": { + "services.test_service.files.file1.activate": { "owner": "default", "value": false }, - "services.test.activate": { + "services.test_service.activate": { "owner": "default", "value": true }, - "services.test.manage": { + "services.test_service.manage": { "owner": "default", "value": true } diff --git a/tests/dictionaries/11disabled_if_in_filelist_boolean/makedict/base.json b/tests/dictionaries/11disabled_if_in_filelist_boolean/makedict/base.json index e0b590dc..ba70a644 100644 --- a/tests/dictionaries/11disabled_if_in_filelist_boolean/makedict/base.json +++ b/tests/dictionaries/11disabled_if_in_filelist_boolean/makedict/base.json @@ -1,7 +1,7 @@ { "rougail.general.condition": true, - "services.test.files.file1.name": "/tmp/file1", - "services.test.files.file1.activate": false, - "services.test.activate": true, - "services.test.manage": true + "services.test_service.files.file1.name": "/tmp/file1", + "services.test_service.files.file1.activate": false, + "services.test_service.activate": true, + "services.test_service.manage": true } diff --git a/tests/dictionaries/11disabled_if_in_filelist_boolean/makedict/before.json b/tests/dictionaries/11disabled_if_in_filelist_boolean/makedict/before.json index 2d2b3390..fb118d0f 100644 --- a/tests/dictionaries/11disabled_if_in_filelist_boolean/makedict/before.json +++ b/tests/dictionaries/11disabled_if_in_filelist_boolean/makedict/before.json @@ -3,19 +3,19 @@ "owner": "default", "value": true }, - "services.test.files.file1.name": { + "services.test_service.files.file1.name": { "owner": "default", "value": "/tmp/file1" }, - "services.test.files.file1.activate": { + "services.test_service.files.file1.activate": { "owner": "default", "value": false }, - "services.test.activate": { + "services.test_service.activate": { "owner": "default", "value": true }, - "services.test.manage": { + "services.test_service.manage": { "owner": "default", "value": true } diff --git a/tests/dictionaries/11disabled_if_in_filelist_boolean/tiramisu/base.py b/tests/dictionaries/11disabled_if_in_filelist_boolean/tiramisu/base.py index 70cfe158..6ac8891b 100644 --- a/tests/dictionaries/11disabled_if_in_filelist_boolean/tiramisu/base.py +++ b/tests/dictionaries/11disabled_if_in_filelist_boolean/tiramisu/base.py @@ -24,6 +24,6 @@ option_7.impl_set_information('source', "file1") option_6 = OptionDescription(name="files", doc="files", children=[option_7]) option_10 = BoolOption(name="activate", doc="activate", 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_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, option_4]) diff --git a/tests/dictionaries/11disabled_if_in_filelist_boolean2/makedict/after.json b/tests/dictionaries/11disabled_if_in_filelist_boolean2/makedict/after.json index a7cf2fa1..b8fb4d22 100644 --- a/tests/dictionaries/11disabled_if_in_filelist_boolean2/makedict/after.json +++ b/tests/dictionaries/11disabled_if_in_filelist_boolean2/makedict/after.json @@ -3,19 +3,19 @@ "owner": "default", "value": false }, - "services.test.files.file1.name": { + "services.test_service.files.file1.name": { "owner": "default", "value": "/tmp/file1" }, - "services.test.files.file1.activate": { + "services.test_service.files.file1.activate": { "owner": "default", "value": true }, - "services.test.activate": { + "services.test_service.activate": { "owner": "default", "value": true }, - "services.test.manage": { + "services.test_service.manage": { "owner": "default", "value": true } diff --git a/tests/dictionaries/11disabled_if_in_filelist_boolean2/makedict/base.json b/tests/dictionaries/11disabled_if_in_filelist_boolean2/makedict/base.json index 1920d6a3..1a9571e4 100644 --- a/tests/dictionaries/11disabled_if_in_filelist_boolean2/makedict/base.json +++ b/tests/dictionaries/11disabled_if_in_filelist_boolean2/makedict/base.json @@ -1,7 +1,7 @@ { "rougail.general.condition": false, - "services.test.files.file1.name": "/tmp/file1", - "services.test.files.file1.activate": true, - "services.test.activate": true, - "services.test.manage": true + "services.test_service.files.file1.name": "/tmp/file1", + "services.test_service.files.file1.activate": true, + "services.test_service.activate": true, + "services.test_service.manage": true } diff --git a/tests/dictionaries/11disabled_if_in_filelist_boolean2/makedict/before.json b/tests/dictionaries/11disabled_if_in_filelist_boolean2/makedict/before.json index a7cf2fa1..b8fb4d22 100644 --- a/tests/dictionaries/11disabled_if_in_filelist_boolean2/makedict/before.json +++ b/tests/dictionaries/11disabled_if_in_filelist_boolean2/makedict/before.json @@ -3,19 +3,19 @@ "owner": "default", "value": false }, - "services.test.files.file1.name": { + "services.test_service.files.file1.name": { "owner": "default", "value": "/tmp/file1" }, - "services.test.files.file1.activate": { + "services.test_service.files.file1.activate": { "owner": "default", "value": true }, - "services.test.activate": { + "services.test_service.activate": { "owner": "default", "value": true }, - "services.test.manage": { + "services.test_service.manage": { "owner": "default", "value": true } diff --git a/tests/dictionaries/11disabled_if_in_filelist_boolean2/tiramisu/base.py b/tests/dictionaries/11disabled_if_in_filelist_boolean2/tiramisu/base.py index 4c03add8..4dd0f074 100644 --- a/tests/dictionaries/11disabled_if_in_filelist_boolean2/tiramisu/base.py +++ b/tests/dictionaries/11disabled_if_in_filelist_boolean2/tiramisu/base.py @@ -24,6 +24,6 @@ option_7.impl_set_information('source', "file1") option_6 = OptionDescription(name="files", doc="files", children=[option_7]) option_10 = BoolOption(name="activate", doc="activate", 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_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, option_4]) diff --git a/tests/dictionaries/11disabled_if_in_filelist_disabled/makedict/after.json b/tests/dictionaries/11disabled_if_in_filelist_disabled/makedict/after.json index 9c46a022..060b431b 100644 --- a/tests/dictionaries/11disabled_if_in_filelist_disabled/makedict/after.json +++ b/tests/dictionaries/11disabled_if_in_filelist_disabled/makedict/after.json @@ -3,19 +3,19 @@ "owner": "default", "value": "oui" }, - "services.test.files.file.name": { + "services.test_service.files.file.name": { "owner": "default", "value": "/etc/file" }, - "services.test.files.file.activate": { + "services.test_service.files.file.activate": { "owner": "default", "value": false }, - "services.test.activate": { + "services.test_service.activate": { "owner": "default", "value": true }, - "services.test.manage": { + "services.test_service.manage": { "owner": "default", "value": true } diff --git a/tests/dictionaries/11disabled_if_in_filelist_disabled/makedict/base.json b/tests/dictionaries/11disabled_if_in_filelist_disabled/makedict/base.json index a7466708..10290151 100644 --- a/tests/dictionaries/11disabled_if_in_filelist_disabled/makedict/base.json +++ b/tests/dictionaries/11disabled_if_in_filelist_disabled/makedict/base.json @@ -1,7 +1,7 @@ { "rougail.general.condition": "oui", - "services.test.files.file.name": "/etc/file", - "services.test.files.file.activate": false, - "services.test.activate": true, - "services.test.manage": true + "services.test_service.files.file.name": "/etc/file", + "services.test_service.files.file.activate": false, + "services.test_service.activate": true, + "services.test_service.manage": true } diff --git a/tests/dictionaries/11disabled_if_in_filelist_disabled/makedict/before.json b/tests/dictionaries/11disabled_if_in_filelist_disabled/makedict/before.json index 9c46a022..060b431b 100644 --- a/tests/dictionaries/11disabled_if_in_filelist_disabled/makedict/before.json +++ b/tests/dictionaries/11disabled_if_in_filelist_disabled/makedict/before.json @@ -3,19 +3,19 @@ "owner": "default", "value": "oui" }, - "services.test.files.file.name": { + "services.test_service.files.file.name": { "owner": "default", "value": "/etc/file" }, - "services.test.files.file.activate": { + "services.test_service.files.file.activate": { "owner": "default", "value": false }, - "services.test.activate": { + "services.test_service.activate": { "owner": "default", "value": true }, - "services.test.manage": { + "services.test_service.manage": { "owner": "default", "value": true } diff --git a/tests/dictionaries/11disabled_if_in_filelist_disabled/tiramisu/base.py b/tests/dictionaries/11disabled_if_in_filelist_disabled/tiramisu/base.py index 0d80e160..1fa10e6c 100644 --- a/tests/dictionaries/11disabled_if_in_filelist_disabled/tiramisu/base.py +++ b/tests/dictionaries/11disabled_if_in_filelist_disabled/tiramisu/base.py @@ -26,6 +26,6 @@ option_9.impl_set_information('source', "file") option_8 = OptionDescription(name="files", doc="files", children=[option_9]) option_12 = BoolOption(name="activate", doc="activate", 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_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, option_6]) diff --git a/tests/dictionaries/11disabled_if_in_filelist_multi/makedict/after.json b/tests/dictionaries/11disabled_if_in_filelist_multi/makedict/after.json index f09965a8..b8e2fa4f 100644 --- a/tests/dictionaries/11disabled_if_in_filelist_multi/makedict/after.json +++ b/tests/dictionaries/11disabled_if_in_filelist_multi/makedict/after.json @@ -11,27 +11,27 @@ "owner": "default", "value": "non" }, - "services.test.files.file1.name": { + "services.test_service.files.file1.name": { "owner": "default", "value": "/tmp/file1" }, - "services.test.files.file1.activate": { + "services.test_service.files.file1.activate": { "owner": "default", "value": true }, - "services.test.files.file2.name": { + "services.test_service.files.file2.name": { "owner": "default", "value": "/tmp/file2" }, - "services.test.files.file2.activate": { + "services.test_service.files.file2.activate": { "owner": "default", "value": true }, - "services.test.activate": { + "services.test_service.activate": { "owner": "default", "value": true }, - "services.test.manage": { + "services.test_service.manage": { "owner": "default", "value": true } diff --git a/tests/dictionaries/11disabled_if_in_filelist_multi/makedict/base.json b/tests/dictionaries/11disabled_if_in_filelist_multi/makedict/base.json index 0e923582..dbf99bf1 100644 --- a/tests/dictionaries/11disabled_if_in_filelist_multi/makedict/base.json +++ b/tests/dictionaries/11disabled_if_in_filelist_multi/makedict/base.json @@ -2,10 +2,10 @@ "rougail.general.condition": "non", "rougail.general.mode_conteneur_actif": "non", "rougail.general.mode_conteneur_actif2": "non", - "services.test.files.file1.name": "/tmp/file1", - "services.test.files.file1.activate": true, - "services.test.files.file2.name": "/tmp/file2", - "services.test.files.file2.activate": true, - "services.test.activate": true, - "services.test.manage": true + "services.test_service.files.file1.name": "/tmp/file1", + "services.test_service.files.file1.activate": true, + "services.test_service.files.file2.name": "/tmp/file2", + "services.test_service.files.file2.activate": true, + "services.test_service.activate": true, + "services.test_service.manage": true } diff --git a/tests/dictionaries/11disabled_if_in_filelist_multi/makedict/before.json b/tests/dictionaries/11disabled_if_in_filelist_multi/makedict/before.json index f09965a8..b8e2fa4f 100644 --- a/tests/dictionaries/11disabled_if_in_filelist_multi/makedict/before.json +++ b/tests/dictionaries/11disabled_if_in_filelist_multi/makedict/before.json @@ -11,27 +11,27 @@ "owner": "default", "value": "non" }, - "services.test.files.file1.name": { + "services.test_service.files.file1.name": { "owner": "default", "value": "/tmp/file1" }, - "services.test.files.file1.activate": { + "services.test_service.files.file1.activate": { "owner": "default", "value": true }, - "services.test.files.file2.name": { + "services.test_service.files.file2.name": { "owner": "default", "value": "/tmp/file2" }, - "services.test.files.file2.activate": { + "services.test_service.files.file2.activate": { "owner": "default", "value": true }, - "services.test.activate": { + "services.test_service.activate": { "owner": "default", "value": true }, - "services.test.manage": { + "services.test_service.manage": { "owner": "default", "value": true } diff --git a/tests/dictionaries/11disabled_if_in_filelist_multi/tiramisu/base.py b/tests/dictionaries/11disabled_if_in_filelist_multi/tiramisu/base.py index adb2a584..ba80b81d 100644 --- a/tests/dictionaries/11disabled_if_in_filelist_multi/tiramisu/base.py +++ b/tests/dictionaries/11disabled_if_in_filelist_multi/tiramisu/base.py @@ -30,6 +30,6 @@ option_12.impl_set_information('source', "file2") option_8 = OptionDescription(name="files", doc="files", children=[option_9, option_12]) option_15 = BoolOption(name="activate", doc="activate", default=True) option_16 = BoolOption(name="manage", doc="manage", default=True) -option_7 = OptionDescription(name="test", doc="test", children=[option_8, option_15, option_16]) +option_7 = OptionDescription(name="test_service", doc="test.service", children=[option_8, option_15, option_16]) 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]) diff --git a/tests/dictionaries/11disabled_if_in_filelist_same_name/makedict/after.json b/tests/dictionaries/11disabled_if_in_filelist_same_name/makedict/after.json index 14937b25..6ffeb240 100644 --- a/tests/dictionaries/11disabled_if_in_filelist_same_name/makedict/after.json +++ b/tests/dictionaries/11disabled_if_in_filelist_same_name/makedict/after.json @@ -11,19 +11,19 @@ "owner": "default", "value": true }, - "services.test.files.file.name": { + "services.test_service.files.file.name": { "owner": "default", "value": "/etc/file" }, - "services.test.files.file.activate": { + "services.test_service.files.file.activate": { "owner": "default", "value": true }, - "services.test.activate": { + "services.test_service.activate": { "owner": "default", "value": true }, - "services.test.manage": { + "services.test_service.manage": { "owner": "default", "value": true } diff --git a/tests/dictionaries/11disabled_if_in_filelist_same_name/makedict/base.json b/tests/dictionaries/11disabled_if_in_filelist_same_name/makedict/base.json index 05d18c18..16dcb103 100644 --- a/tests/dictionaries/11disabled_if_in_filelist_same_name/makedict/base.json +++ b/tests/dictionaries/11disabled_if_in_filelist_same_name/makedict/base.json @@ -2,8 +2,8 @@ "rougail.general.condition": "non", "rougail.general.mode_conteneur_actif": "non", "rougail.general.mode_conteneur_actif2": true, - "services.test.files.file.name": "/etc/file", - "services.test.files.file.activate": true, - "services.test.activate": true, - "services.test.manage": true + "services.test_service.files.file.name": "/etc/file", + "services.test_service.files.file.activate": true, + "services.test_service.activate": true, + "services.test_service.manage": true } diff --git a/tests/dictionaries/11disabled_if_in_filelist_same_name/makedict/before.json b/tests/dictionaries/11disabled_if_in_filelist_same_name/makedict/before.json index 14937b25..6ffeb240 100644 --- a/tests/dictionaries/11disabled_if_in_filelist_same_name/makedict/before.json +++ b/tests/dictionaries/11disabled_if_in_filelist_same_name/makedict/before.json @@ -11,19 +11,19 @@ "owner": "default", "value": true }, - "services.test.files.file.name": { + "services.test_service.files.file.name": { "owner": "default", "value": "/etc/file" }, - "services.test.files.file.activate": { + "services.test_service.files.file.activate": { "owner": "default", "value": true }, - "services.test.activate": { + "services.test_service.activate": { "owner": "default", "value": true }, - "services.test.manage": { + "services.test_service.manage": { "owner": "default", "value": true } diff --git a/tests/dictionaries/11disabled_if_in_filelist_same_name/tiramisu/base.py b/tests/dictionaries/11disabled_if_in_filelist_same_name/tiramisu/base.py index fe57005d..0731423d 100644 --- a/tests/dictionaries/11disabled_if_in_filelist_same_name/tiramisu/base.py +++ b/tests/dictionaries/11disabled_if_in_filelist_same_name/tiramisu/base.py @@ -26,6 +26,6 @@ option_9.impl_set_information('source', "file") option_8 = OptionDescription(name="files", doc="files", children=[option_9]) option_12 = BoolOption(name="activate", doc="activate", 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_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, option_6]) diff --git a/tests/dictionaries/11disabledifin_filelist_notexist/makedict/after.json b/tests/dictionaries/11disabledifin_filelist_notexist/makedict/after.json index 7017b8a5..93b9a6e8 100644 --- a/tests/dictionaries/11disabledifin_filelist_notexist/makedict/after.json +++ b/tests/dictionaries/11disabledifin_filelist_notexist/makedict/after.json @@ -11,19 +11,19 @@ "owner": "default", "value": "non" }, - "services.test.files.file.name": { + "services.test_service.files.file.name": { "owner": "default", "value": "/tmp/file" }, - "services.test.files.file.activate": { + "services.test_service.files.file.activate": { "owner": "default", "value": false }, - "services.test.activate": { + "services.test_service.activate": { "owner": "default", "value": true }, - "services.test.manage": { + "services.test_service.manage": { "owner": "default", "value": true } diff --git a/tests/dictionaries/11disabledifin_filelist_notexist/makedict/base.json b/tests/dictionaries/11disabledifin_filelist_notexist/makedict/base.json index 23361c53..71d20317 100644 --- a/tests/dictionaries/11disabledifin_filelist_notexist/makedict/base.json +++ b/tests/dictionaries/11disabledifin_filelist_notexist/makedict/base.json @@ -2,8 +2,8 @@ "rougail.general.condition": "non", "rougail.general.mode_conteneur_actif": "non", "rougail.general.mode_conteneur_actif2": "non", - "services.test.files.file.name": "/tmp/file", - "services.test.files.file.activate": false, - "services.test.activate": true, - "services.test.manage": true + "services.test_service.files.file.name": "/tmp/file", + "services.test_service.files.file.activate": false, + "services.test_service.activate": true, + "services.test_service.manage": true } diff --git a/tests/dictionaries/11disabledifin_filelist_notexist/makedict/before.json b/tests/dictionaries/11disabledifin_filelist_notexist/makedict/before.json index 7017b8a5..93b9a6e8 100644 --- a/tests/dictionaries/11disabledifin_filelist_notexist/makedict/before.json +++ b/tests/dictionaries/11disabledifin_filelist_notexist/makedict/before.json @@ -11,19 +11,19 @@ "owner": "default", "value": "non" }, - "services.test.files.file.name": { + "services.test_service.files.file.name": { "owner": "default", "value": "/tmp/file" }, - "services.test.files.file.activate": { + "services.test_service.files.file.activate": { "owner": "default", "value": false }, - "services.test.activate": { + "services.test_service.activate": { "owner": "default", "value": true }, - "services.test.manage": { + "services.test_service.manage": { "owner": "default", "value": true } diff --git a/tests/dictionaries/11disabledifin_filelist_notexist/tiramisu/base.py b/tests/dictionaries/11disabledifin_filelist_notexist/tiramisu/base.py index bb64248f..ebd92ec3 100644 --- a/tests/dictionaries/11disabledifin_filelist_notexist/tiramisu/base.py +++ b/tests/dictionaries/11disabledifin_filelist_notexist/tiramisu/base.py @@ -26,6 +26,6 @@ option_9.impl_set_information('source', "file") option_8 = OptionDescription(name="files", doc="files", children=[option_9]) option_12 = BoolOption(name="activate", doc="activate", 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_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, option_6]) diff --git a/tests/dictionaries/11disabledifnotin_filelist_notexist/makedict/after.json b/tests/dictionaries/11disabledifnotin_filelist_notexist/makedict/after.json index 7017b8a5..93b9a6e8 100644 --- a/tests/dictionaries/11disabledifnotin_filelist_notexist/makedict/after.json +++ b/tests/dictionaries/11disabledifnotin_filelist_notexist/makedict/after.json @@ -11,19 +11,19 @@ "owner": "default", "value": "non" }, - "services.test.files.file.name": { + "services.test_service.files.file.name": { "owner": "default", "value": "/tmp/file" }, - "services.test.files.file.activate": { + "services.test_service.files.file.activate": { "owner": "default", "value": false }, - "services.test.activate": { + "services.test_service.activate": { "owner": "default", "value": true }, - "services.test.manage": { + "services.test_service.manage": { "owner": "default", "value": true } diff --git a/tests/dictionaries/11disabledifnotin_filelist_notexist/makedict/base.json b/tests/dictionaries/11disabledifnotin_filelist_notexist/makedict/base.json index 23361c53..71d20317 100644 --- a/tests/dictionaries/11disabledifnotin_filelist_notexist/makedict/base.json +++ b/tests/dictionaries/11disabledifnotin_filelist_notexist/makedict/base.json @@ -2,8 +2,8 @@ "rougail.general.condition": "non", "rougail.general.mode_conteneur_actif": "non", "rougail.general.mode_conteneur_actif2": "non", - "services.test.files.file.name": "/tmp/file", - "services.test.files.file.activate": false, - "services.test.activate": true, - "services.test.manage": true + "services.test_service.files.file.name": "/tmp/file", + "services.test_service.files.file.activate": false, + "services.test_service.activate": true, + "services.test_service.manage": true } diff --git a/tests/dictionaries/11disabledifnotin_filelist_notexist/makedict/before.json b/tests/dictionaries/11disabledifnotin_filelist_notexist/makedict/before.json index 7017b8a5..93b9a6e8 100644 --- a/tests/dictionaries/11disabledifnotin_filelist_notexist/makedict/before.json +++ b/tests/dictionaries/11disabledifnotin_filelist_notexist/makedict/before.json @@ -11,19 +11,19 @@ "owner": "default", "value": "non" }, - "services.test.files.file.name": { + "services.test_service.files.file.name": { "owner": "default", "value": "/tmp/file" }, - "services.test.files.file.activate": { + "services.test_service.files.file.activate": { "owner": "default", "value": false }, - "services.test.activate": { + "services.test_service.activate": { "owner": "default", "value": true }, - "services.test.manage": { + "services.test_service.manage": { "owner": "default", "value": true } diff --git a/tests/dictionaries/11disabledifnotin_filelist_notexist/tiramisu/base.py b/tests/dictionaries/11disabledifnotin_filelist_notexist/tiramisu/base.py index bb64248f..ebd92ec3 100644 --- a/tests/dictionaries/11disabledifnotin_filelist_notexist/tiramisu/base.py +++ b/tests/dictionaries/11disabledifnotin_filelist_notexist/tiramisu/base.py @@ -26,6 +26,6 @@ option_9.impl_set_information('source', "file") option_8 = OptionDescription(name="files", doc="files", children=[option_9]) option_12 = BoolOption(name="activate", doc="activate", 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_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, option_6]) diff --git a/tests/dictionaries/11disabledifnotin_filelist_notexist_multi/makedict/after.json b/tests/dictionaries/11disabledifnotin_filelist_notexist_multi/makedict/after.json index 7017b8a5..93b9a6e8 100644 --- a/tests/dictionaries/11disabledifnotin_filelist_notexist_multi/makedict/after.json +++ b/tests/dictionaries/11disabledifnotin_filelist_notexist_multi/makedict/after.json @@ -11,19 +11,19 @@ "owner": "default", "value": "non" }, - "services.test.files.file.name": { + "services.test_service.files.file.name": { "owner": "default", "value": "/tmp/file" }, - "services.test.files.file.activate": { + "services.test_service.files.file.activate": { "owner": "default", "value": false }, - "services.test.activate": { + "services.test_service.activate": { "owner": "default", "value": true }, - "services.test.manage": { + "services.test_service.manage": { "owner": "default", "value": true } diff --git a/tests/dictionaries/11disabledifnotin_filelist_notexist_multi/makedict/base.json b/tests/dictionaries/11disabledifnotin_filelist_notexist_multi/makedict/base.json index 23361c53..71d20317 100644 --- a/tests/dictionaries/11disabledifnotin_filelist_notexist_multi/makedict/base.json +++ b/tests/dictionaries/11disabledifnotin_filelist_notexist_multi/makedict/base.json @@ -2,8 +2,8 @@ "rougail.general.condition": "non", "rougail.general.mode_conteneur_actif": "non", "rougail.general.mode_conteneur_actif2": "non", - "services.test.files.file.name": "/tmp/file", - "services.test.files.file.activate": false, - "services.test.activate": true, - "services.test.manage": true + "services.test_service.files.file.name": "/tmp/file", + "services.test_service.files.file.activate": false, + "services.test_service.activate": true, + "services.test_service.manage": true } diff --git a/tests/dictionaries/11disabledifnotin_filelist_notexist_multi/makedict/before.json b/tests/dictionaries/11disabledifnotin_filelist_notexist_multi/makedict/before.json index 7017b8a5..93b9a6e8 100644 --- a/tests/dictionaries/11disabledifnotin_filelist_notexist_multi/makedict/before.json +++ b/tests/dictionaries/11disabledifnotin_filelist_notexist_multi/makedict/before.json @@ -11,19 +11,19 @@ "owner": "default", "value": "non" }, - "services.test.files.file.name": { + "services.test_service.files.file.name": { "owner": "default", "value": "/tmp/file" }, - "services.test.files.file.activate": { + "services.test_service.files.file.activate": { "owner": "default", "value": false }, - "services.test.activate": { + "services.test_service.activate": { "owner": "default", "value": true }, - "services.test.manage": { + "services.test_service.manage": { "owner": "default", "value": true } diff --git a/tests/dictionaries/11disabledifnotin_filelist_notexist_multi/tiramisu/base.py b/tests/dictionaries/11disabledifnotin_filelist_notexist_multi/tiramisu/base.py index e7bad530..52558744 100644 --- a/tests/dictionaries/11disabledifnotin_filelist_notexist_multi/tiramisu/base.py +++ b/tests/dictionaries/11disabledifnotin_filelist_notexist_multi/tiramisu/base.py @@ -26,6 +26,6 @@ option_9.impl_set_information('source', "file") option_8 = OptionDescription(name="files", doc="files", children=[option_9]) option_12 = BoolOption(name="activate", doc="activate", 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_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, option_6]) diff --git a/tests/dictionaries/11disabledifnotin_filelist_notexist_validenum/makedict/after.json b/tests/dictionaries/11disabledifnotin_filelist_notexist_validenum/makedict/after.json index 7017b8a5..93b9a6e8 100644 --- a/tests/dictionaries/11disabledifnotin_filelist_notexist_validenum/makedict/after.json +++ b/tests/dictionaries/11disabledifnotin_filelist_notexist_validenum/makedict/after.json @@ -11,19 +11,19 @@ "owner": "default", "value": "non" }, - "services.test.files.file.name": { + "services.test_service.files.file.name": { "owner": "default", "value": "/tmp/file" }, - "services.test.files.file.activate": { + "services.test_service.files.file.activate": { "owner": "default", "value": false }, - "services.test.activate": { + "services.test_service.activate": { "owner": "default", "value": true }, - "services.test.manage": { + "services.test_service.manage": { "owner": "default", "value": true } diff --git a/tests/dictionaries/11disabledifnotin_filelist_notexist_validenum/makedict/base.json b/tests/dictionaries/11disabledifnotin_filelist_notexist_validenum/makedict/base.json index 23361c53..71d20317 100644 --- a/tests/dictionaries/11disabledifnotin_filelist_notexist_validenum/makedict/base.json +++ b/tests/dictionaries/11disabledifnotin_filelist_notexist_validenum/makedict/base.json @@ -2,8 +2,8 @@ "rougail.general.condition": "non", "rougail.general.mode_conteneur_actif": "non", "rougail.general.mode_conteneur_actif2": "non", - "services.test.files.file.name": "/tmp/file", - "services.test.files.file.activate": false, - "services.test.activate": true, - "services.test.manage": true + "services.test_service.files.file.name": "/tmp/file", + "services.test_service.files.file.activate": false, + "services.test_service.activate": true, + "services.test_service.manage": true } diff --git a/tests/dictionaries/11disabledifnotin_filelist_notexist_validenum/makedict/before.json b/tests/dictionaries/11disabledifnotin_filelist_notexist_validenum/makedict/before.json index 7017b8a5..93b9a6e8 100644 --- a/tests/dictionaries/11disabledifnotin_filelist_notexist_validenum/makedict/before.json +++ b/tests/dictionaries/11disabledifnotin_filelist_notexist_validenum/makedict/before.json @@ -11,19 +11,19 @@ "owner": "default", "value": "non" }, - "services.test.files.file.name": { + "services.test_service.files.file.name": { "owner": "default", "value": "/tmp/file" }, - "services.test.files.file.activate": { + "services.test_service.files.file.activate": { "owner": "default", "value": false }, - "services.test.activate": { + "services.test_service.activate": { "owner": "default", "value": true }, - "services.test.manage": { + "services.test_service.manage": { "owner": "default", "value": true } diff --git a/tests/dictionaries/11disabledifnotin_filelist_notexist_validenum/tiramisu/base.py b/tests/dictionaries/11disabledifnotin_filelist_notexist_validenum/tiramisu/base.py index 20eee731..50214b62 100644 --- a/tests/dictionaries/11disabledifnotin_filelist_notexist_validenum/tiramisu/base.py +++ b/tests/dictionaries/11disabledifnotin_filelist_notexist_validenum/tiramisu/base.py @@ -26,6 +26,6 @@ option_9.impl_set_information('source', "file") option_8 = OptionDescription(name="files", doc="files", children=[option_9]) option_12 = BoolOption(name="activate", doc="activate", 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_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, option_6]) diff --git a/tests/dictionaries/11multi_disabled_if_in_filelist/makedict/after.json b/tests/dictionaries/11multi_disabled_if_in_filelist/makedict/after.json index e578b184..3c6b850b 100644 --- a/tests/dictionaries/11multi_disabled_if_in_filelist/makedict/after.json +++ b/tests/dictionaries/11multi_disabled_if_in_filelist/makedict/after.json @@ -7,19 +7,19 @@ "owner": "default", "value": "non" }, - "services.test.files.file1.name": { + "services.test_service.files.file1.name": { "owner": "default", "value": "/tmp/file1" }, - "services.test.files.file1.activate": { + "services.test_service.files.file1.activate": { "owner": "default", "value": false }, - "services.test.activate": { + "services.test_service.activate": { "owner": "default", "value": true }, - "services.test.manage": { + "services.test_service.manage": { "owner": "default", "value": true } diff --git a/tests/dictionaries/11multi_disabled_if_in_filelist/makedict/base.json b/tests/dictionaries/11multi_disabled_if_in_filelist/makedict/base.json index 4c33e3d9..d2d2b661 100644 --- a/tests/dictionaries/11multi_disabled_if_in_filelist/makedict/base.json +++ b/tests/dictionaries/11multi_disabled_if_in_filelist/makedict/base.json @@ -1,8 +1,8 @@ { "rougail.general.mode_conteneur_actif": "non", "rougail.general.condition": "non", - "services.test.files.file1.name": "/tmp/file1", - "services.test.files.file1.activate": false, - "services.test.activate": true, - "services.test.manage": true + "services.test_service.files.file1.name": "/tmp/file1", + "services.test_service.files.file1.activate": false, + "services.test_service.activate": true, + "services.test_service.manage": true } diff --git a/tests/dictionaries/11multi_disabled_if_in_filelist/makedict/before.json b/tests/dictionaries/11multi_disabled_if_in_filelist/makedict/before.json index e578b184..3c6b850b 100644 --- a/tests/dictionaries/11multi_disabled_if_in_filelist/makedict/before.json +++ b/tests/dictionaries/11multi_disabled_if_in_filelist/makedict/before.json @@ -7,19 +7,19 @@ "owner": "default", "value": "non" }, - "services.test.files.file1.name": { + "services.test_service.files.file1.name": { "owner": "default", "value": "/tmp/file1" }, - "services.test.files.file1.activate": { + "services.test_service.files.file1.activate": { "owner": "default", "value": false }, - "services.test.activate": { + "services.test_service.activate": { "owner": "default", "value": true }, - "services.test.manage": { + "services.test_service.manage": { "owner": "default", "value": true } diff --git a/tests/dictionaries/11multi_disabled_if_in_filelist/tiramisu/base.py b/tests/dictionaries/11multi_disabled_if_in_filelist/tiramisu/base.py index e9ffe0cc..5a8f913e 100644 --- a/tests/dictionaries/11multi_disabled_if_in_filelist/tiramisu/base.py +++ b/tests/dictionaries/11multi_disabled_if_in_filelist/tiramisu/base.py @@ -25,6 +25,6 @@ option_8.impl_set_information('source', "file1") option_7 = OptionDescription(name="files", doc="files", children=[option_8]) option_11 = BoolOption(name="activate", doc="activate", 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_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, option_5]) diff --git a/tests/dictionaries/20notemplating/makedict/after.json b/tests/dictionaries/20notemplating/makedict/after.json index 406d96f0..c40ee8cf 100644 --- a/tests/dictionaries/20notemplating/makedict/after.json +++ b/tests/dictionaries/20notemplating/makedict/after.json @@ -3,19 +3,19 @@ "owner": "default", "value": "non" }, - "services.test.files.file.name": { + "services.test_service.files.file.name": { "owner": "default", "value": "/etc/file" }, - "services.test.files.file.activate": { + "services.test_service.files.file.activate": { "owner": "default", "value": true }, - "services.test.activate": { + "services.test_service.activate": { "owner": "default", "value": true }, - "services.test.manage": { + "services.test_service.manage": { "owner": "default", "value": true } diff --git a/tests/dictionaries/20notemplating/makedict/base.json b/tests/dictionaries/20notemplating/makedict/base.json index a1e4c0db..07d7d723 100644 --- a/tests/dictionaries/20notemplating/makedict/base.json +++ b/tests/dictionaries/20notemplating/makedict/base.json @@ -1,7 +1,7 @@ { "rougail.general.mode_conteneur_actif": "non", - "services.test.files.file.name": "/etc/file", - "services.test.files.file.activate": true, - "services.test.activate": true, - "services.test.manage": true + "services.test_service.files.file.name": "/etc/file", + "services.test_service.files.file.activate": true, + "services.test_service.activate": true, + "services.test_service.manage": true } diff --git a/tests/dictionaries/20notemplating/makedict/before.json b/tests/dictionaries/20notemplating/makedict/before.json index 406d96f0..c40ee8cf 100644 --- a/tests/dictionaries/20notemplating/makedict/before.json +++ b/tests/dictionaries/20notemplating/makedict/before.json @@ -3,19 +3,19 @@ "owner": "default", "value": "non" }, - "services.test.files.file.name": { + "services.test_service.files.file.name": { "owner": "default", "value": "/etc/file" }, - "services.test.files.file.activate": { + "services.test_service.files.file.activate": { "owner": "default", "value": true }, - "services.test.activate": { + "services.test_service.activate": { "owner": "default", "value": true }, - "services.test.manage": { + "services.test_service.manage": { "owner": "default", "value": true } diff --git a/tests/dictionaries/20notemplating/tiramisu/base.py b/tests/dictionaries/20notemplating/tiramisu/base.py index d16b2911..4ed79e93 100644 --- a/tests/dictionaries/20notemplating/tiramisu/base.py +++ b/tests/dictionaries/20notemplating/tiramisu/base.py @@ -25,6 +25,6 @@ option_7.impl_set_information('source', "file") option_6 = OptionDescription(name="files", doc="files", children=[option_7]) option_10 = BoolOption(name="activate", doc="activate", 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_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, option_4]) diff --git a/tests/dictionaries/20override/makedict/after.json b/tests/dictionaries/20override/makedict/after.json index a80dd37d..b63e355a 100644 --- a/tests/dictionaries/20override/makedict/after.json +++ b/tests/dictionaries/20override/makedict/after.json @@ -3,27 +3,27 @@ "owner": "default", "value": "non" }, - "services.test.overrides.test_service.activate": { + "services.test_service.overrides.test_service.activate": { "owner": "default", "value": true }, - "services.test.activate": { + "services.test_service.activate": { "owner": "default", "value": true }, - "services.test.manage": { + "services.test_service.manage": { "owner": "default", "value": true }, - "services.test2.overrides.test2_service.activate": { + "services.test2_service.overrides.test2_service.activate": { "owner": "default", "value": true }, - "services.test2.activate": { + "services.test2_service.activate": { "owner": "default", "value": true }, - "services.test2.manage": { + "services.test2_service.manage": { "owner": "default", "value": true } diff --git a/tests/dictionaries/20override/makedict/base.json b/tests/dictionaries/20override/makedict/base.json index 2de81c42..9a91257a 100644 --- a/tests/dictionaries/20override/makedict/base.json +++ b/tests/dictionaries/20override/makedict/base.json @@ -1,9 +1,9 @@ { "rougail.general.mode_conteneur_actif": "non", - "services.test.overrides.test_service.activate": true, - "services.test.activate": true, - "services.test.manage": true, - "services.test2.overrides.test2_service.activate": true, - "services.test2.activate": true, - "services.test2.manage": true + "services.test_service.overrides.test_service.activate": true, + "services.test_service.activate": true, + "services.test_service.manage": true, + "services.test2_service.overrides.test2_service.activate": true, + "services.test2_service.activate": true, + "services.test2_service.manage": true } diff --git a/tests/dictionaries/20override/makedict/before.json b/tests/dictionaries/20override/makedict/before.json index a80dd37d..b63e355a 100644 --- a/tests/dictionaries/20override/makedict/before.json +++ b/tests/dictionaries/20override/makedict/before.json @@ -3,27 +3,27 @@ "owner": "default", "value": "non" }, - "services.test.overrides.test_service.activate": { + "services.test_service.overrides.test_service.activate": { "owner": "default", "value": true }, - "services.test.activate": { + "services.test_service.activate": { "owner": "default", "value": true }, - "services.test.manage": { + "services.test_service.manage": { "owner": "default", "value": true }, - "services.test2.overrides.test2_service.activate": { + "services.test2_service.overrides.test2_service.activate": { "owner": "default", "value": true }, - "services.test2.activate": { + "services.test2_service.activate": { "owner": "default", "value": true }, - "services.test2.manage": { + "services.test2_service.manage": { "owner": "default", "value": true } diff --git a/tests/dictionaries/20override/tiramisu/base.py b/tests/dictionaries/20override/tiramisu/base.py index 053ecfb1..dddb8fc1 100644 --- a/tests/dictionaries/20override/tiramisu/base.py +++ b/tests/dictionaries/20override/tiramisu/base.py @@ -19,20 +19,20 @@ option_2 = OptionDescription(name="general", doc="general", children=[option_3], option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2]) option_8 = BoolOption(name="activate", doc="activate", default=True) option_7 = OptionDescription(name="test_service", doc="test.service", children=[option_8]) -option_7.impl_set_information('name', "test") +option_7.impl_set_information('name', "test.service") option_7.impl_set_information('source', "test.service") option_6 = OptionDescription(name="overrides", doc="overrides", children=[option_7]) option_9 = BoolOption(name="activate", doc="activate", default=True) option_10 = BoolOption(name="manage", doc="manage", default=True) -option_5 = OptionDescription(name="test", doc="test", children=[option_6, option_9, option_10]) +option_5 = OptionDescription(name="test_service", doc="test.service", children=[option_6, option_9, option_10]) option_14 = BoolOption(name="activate", doc="activate", default=True) option_13 = OptionDescription(name="test2_service", doc="test2.service", children=[option_14]) option_13.impl_set_information('engine', "jinja2") -option_13.impl_set_information('name', "test2") +option_13.impl_set_information('name', "test2.service") option_13.impl_set_information('source', "test2.service") option_12 = OptionDescription(name="overrides", doc="overrides", children=[option_13]) option_15 = BoolOption(name="activate", doc="activate", default=True) option_16 = BoolOption(name="manage", doc="manage", default=True) -option_11 = OptionDescription(name="test2", doc="test2", children=[option_12, option_15, option_16]) +option_11 = OptionDescription(name="test2_service", doc="test2.service", children=[option_12, option_15, option_16]) option_4 = OptionDescription(name="services", doc="services", children=[option_5, option_11], properties=frozenset({"hidden"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, option_4]) diff --git a/tests/dictionaries/20override_no_templating/makedict/after.json b/tests/dictionaries/20override_no_templating/makedict/after.json index b76fd3d1..d916a90f 100644 --- a/tests/dictionaries/20override_no_templating/makedict/after.json +++ b/tests/dictionaries/20override_no_templating/makedict/after.json @@ -3,15 +3,15 @@ "owner": "default", "value": "non" }, - "services.test.overrides.test_service.activate": { + "services.test_service.overrides.test_service.activate": { "owner": "default", "value": true }, - "services.test.activate": { + "services.test_service.activate": { "owner": "default", "value": true }, - "services.test.manage": { + "services.test_service.manage": { "owner": "default", "value": true } diff --git a/tests/dictionaries/20override_no_templating/makedict/base.json b/tests/dictionaries/20override_no_templating/makedict/base.json index 9dc9b73a..87994e7b 100644 --- a/tests/dictionaries/20override_no_templating/makedict/base.json +++ b/tests/dictionaries/20override_no_templating/makedict/base.json @@ -1,6 +1,6 @@ { "rougail.general.mode_conteneur_actif": "non", - "services.test.overrides.test_service.activate": true, - "services.test.activate": true, - "services.test.manage": true + "services.test_service.overrides.test_service.activate": true, + "services.test_service.activate": true, + "services.test_service.manage": true } diff --git a/tests/dictionaries/20override_no_templating/makedict/before.json b/tests/dictionaries/20override_no_templating/makedict/before.json index b76fd3d1..d916a90f 100644 --- a/tests/dictionaries/20override_no_templating/makedict/before.json +++ b/tests/dictionaries/20override_no_templating/makedict/before.json @@ -3,15 +3,15 @@ "owner": "default", "value": "non" }, - "services.test.overrides.test_service.activate": { + "services.test_service.overrides.test_service.activate": { "owner": "default", "value": true }, - "services.test.activate": { + "services.test_service.activate": { "owner": "default", "value": true }, - "services.test.manage": { + "services.test_service.manage": { "owner": "default", "value": true } diff --git a/tests/dictionaries/20override_no_templating/tiramisu/base.py b/tests/dictionaries/20override_no_templating/tiramisu/base.py index 8700c000..36accc2c 100644 --- a/tests/dictionaries/20override_no_templating/tiramisu/base.py +++ b/tests/dictionaries/20override_no_templating/tiramisu/base.py @@ -20,11 +20,11 @@ option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2]) option_8 = BoolOption(name="activate", doc="activate", default=True) option_7 = OptionDescription(name="test_service", doc="test.service", children=[option_8]) option_7.impl_set_information('engine', "none") -option_7.impl_set_information('name', "test") +option_7.impl_set_information('name', "test.service") option_7.impl_set_information('source', "test.service") option_6 = OptionDescription(name="overrides", doc="overrides", children=[option_7]) option_9 = BoolOption(name="activate", doc="activate", default=True) option_10 = BoolOption(name="manage", doc="manage", default=True) -option_5 = OptionDescription(name="test", doc="test", children=[option_6, option_9, option_10]) +option_5 = OptionDescription(name="test_service", doc="test.service", children=[option_6, option_9, option_10]) 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]) diff --git a/tests/dictionaries/20override_source/makedict/after.json b/tests/dictionaries/20override_source/makedict/after.json index 60992c7f..d3190882 100644 --- a/tests/dictionaries/20override_source/makedict/after.json +++ b/tests/dictionaries/20override_source/makedict/after.json @@ -3,15 +3,15 @@ "owner": "default", "value": "non" }, - "services.test.overrides.test2_service.activate": { + "services.test_service.overrides.test2_service.activate": { "owner": "default", "value": true }, - "services.test.activate": { + "services.test_service.activate": { "owner": "default", "value": true }, - "services.test.manage": { + "services.test_service.manage": { "owner": "default", "value": true } diff --git a/tests/dictionaries/20override_source/makedict/base.json b/tests/dictionaries/20override_source/makedict/base.json index 3c86a824..e24f567b 100644 --- a/tests/dictionaries/20override_source/makedict/base.json +++ b/tests/dictionaries/20override_source/makedict/base.json @@ -1,6 +1,6 @@ { "rougail.general.mode_conteneur_actif": "non", - "services.test.overrides.test2_service.activate": true, - "services.test.activate": true, - "services.test.manage": true + "services.test_service.overrides.test2_service.activate": true, + "services.test_service.activate": true, + "services.test_service.manage": true } diff --git a/tests/dictionaries/20override_source/makedict/before.json b/tests/dictionaries/20override_source/makedict/before.json index 60992c7f..d3190882 100644 --- a/tests/dictionaries/20override_source/makedict/before.json +++ b/tests/dictionaries/20override_source/makedict/before.json @@ -3,15 +3,15 @@ "owner": "default", "value": "non" }, - "services.test.overrides.test2_service.activate": { + "services.test_service.overrides.test2_service.activate": { "owner": "default", "value": true }, - "services.test.activate": { + "services.test_service.activate": { "owner": "default", "value": true }, - "services.test.manage": { + "services.test_service.manage": { "owner": "default", "value": true } diff --git a/tests/dictionaries/20override_source/tiramisu/base.py b/tests/dictionaries/20override_source/tiramisu/base.py index d8130607..448642e2 100644 --- a/tests/dictionaries/20override_source/tiramisu/base.py +++ b/tests/dictionaries/20override_source/tiramisu/base.py @@ -19,11 +19,11 @@ option_2 = OptionDescription(name="general", doc="general", children=[option_3], option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2]) option_8 = BoolOption(name="activate", doc="activate", default=True) option_7 = OptionDescription(name="test2_service", doc="test2.service", children=[option_8]) -option_7.impl_set_information('name', "test") +option_7.impl_set_information('name', "test.service") option_7.impl_set_information('source', "test2.service") option_6 = OptionDescription(name="overrides", doc="overrides", children=[option_7]) option_9 = BoolOption(name="activate", doc="activate", default=True) option_10 = BoolOption(name="manage", doc="manage", default=True) -option_5 = OptionDescription(name="test", doc="test", children=[option_6, option_9, option_10]) +option_5 = OptionDescription(name="test_service", doc="test.service", children=[option_6, option_9, option_10]) 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]) diff --git a/tests/dictionaries/40ifin_leadershipauto/makedict/after.json b/tests/dictionaries/40ifin_leadershipauto/makedict/after.json index 3cde1013..3464501b 100644 --- a/tests/dictionaries/40ifin_leadershipauto/makedict/after.json +++ b/tests/dictionaries/40ifin_leadershipauto/makedict/after.json @@ -21,19 +21,19 @@ null ] }, - "services.test.files.mailname.name": { + "services.test_service.files.mailname.name": { "owner": "default", "value": "/etc/mailname" }, - "services.test.files.mailname.activate": { + "services.test_service.files.mailname.activate": { "owner": "default", "value": true }, - "services.test.activate": { + "services.test_service.activate": { "owner": "default", "value": true }, - "services.test.manage": { + "services.test_service.manage": { "owner": "default", "value": true } diff --git a/tests/dictionaries/40ifin_leadershipauto/makedict/base.json b/tests/dictionaries/40ifin_leadershipauto/makedict/base.json index 364a2fa9..2eac3424 100644 --- a/tests/dictionaries/40ifin_leadershipauto/makedict/base.json +++ b/tests/dictionaries/40ifin_leadershipauto/makedict/base.json @@ -7,8 +7,8 @@ "rougail.general.leader.follower2": null } ], - "services.test.files.mailname.name": "/etc/mailname", - "services.test.files.mailname.activate": true, - "services.test.activate": true, - "services.test.manage": true + "services.test_service.files.mailname.name": "/etc/mailname", + "services.test_service.files.mailname.activate": true, + "services.test_service.activate": true, + "services.test_service.manage": true } diff --git a/tests/dictionaries/40ifin_leadershipauto/makedict/before.json b/tests/dictionaries/40ifin_leadershipauto/makedict/before.json index 3cde1013..3464501b 100644 --- a/tests/dictionaries/40ifin_leadershipauto/makedict/before.json +++ b/tests/dictionaries/40ifin_leadershipauto/makedict/before.json @@ -21,19 +21,19 @@ null ] }, - "services.test.files.mailname.name": { + "services.test_service.files.mailname.name": { "owner": "default", "value": "/etc/mailname" }, - "services.test.files.mailname.activate": { + "services.test_service.files.mailname.activate": { "owner": "default", "value": true }, - "services.test.activate": { + "services.test_service.activate": { "owner": "default", "value": true }, - "services.test.manage": { + "services.test_service.manage": { "owner": "default", "value": true } diff --git a/tests/dictionaries/40ifin_leadershipauto/tiramisu/base.py b/tests/dictionaries/40ifin_leadershipauto/tiramisu/base.py index e64cd9a7..a4b0df4b 100644 --- a/tests/dictionaries/40ifin_leadershipauto/tiramisu/base.py +++ b/tests/dictionaries/40ifin_leadershipauto/tiramisu/base.py @@ -29,6 +29,6 @@ option_12.impl_set_information('source', "mailname") option_11 = OptionDescription(name="files", doc="files", children=[option_12]) option_15 = BoolOption(name="activate", doc="activate", default=True) option_16 = BoolOption(name="manage", doc="manage", default=True) -option_10 = OptionDescription(name="test", doc="test", children=[option_11, option_15, option_16]) +option_10 = OptionDescription(name="test_service", doc="test.service", children=[option_11, option_15, option_16]) option_9 = OptionDescription(name="services", doc="services", children=[option_10], properties=frozenset({"hidden"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, option_9]) diff --git a/tests/dictionaries/40ifin_leadershipauto_follower/makedict/after.json b/tests/dictionaries/40ifin_leadershipauto_follower/makedict/after.json index c78d6ab1..134760c6 100644 --- a/tests/dictionaries/40ifin_leadershipauto_follower/makedict/after.json +++ b/tests/dictionaries/40ifin_leadershipauto_follower/makedict/after.json @@ -34,27 +34,27 @@ null ] }, - "services.test.files.mailname.name": { + "services.test_service.files.mailname.name": { "owner": "default", "value": "/etc/mailname" }, - "services.test.files.mailname.activate": { + "services.test_service.files.mailname.activate": { "owner": "default", "value": true }, - "services.test.files.mailname2.name": { + "services.test_service.files.mailname2.name": { "owner": "default", "value": "/etc/mailname2" }, - "services.test.files.mailname2.activate": { + "services.test_service.files.mailname2.activate": { "owner": "default", "value": true }, - "services.test.activate": { + "services.test_service.activate": { "owner": "default", "value": true }, - "services.test.manage": { + "services.test_service.manage": { "owner": "default", "value": true } diff --git a/tests/dictionaries/40ifin_leadershipauto_follower/makedict/base.json b/tests/dictionaries/40ifin_leadershipauto_follower/makedict/base.json index 28acc53e..c49f4776 100644 --- a/tests/dictionaries/40ifin_leadershipauto_follower/makedict/base.json +++ b/tests/dictionaries/40ifin_leadershipauto_follower/makedict/base.json @@ -12,10 +12,10 @@ "rougail.general.leader.follower2": null } ], - "services.test.files.mailname.name": "/etc/mailname", - "services.test.files.mailname.activate": true, - "services.test.files.mailname2.name": "/etc/mailname2", - "services.test.files.mailname2.activate": true, - "services.test.activate": true, - "services.test.manage": true + "services.test_service.files.mailname.name": "/etc/mailname", + "services.test_service.files.mailname.activate": true, + "services.test_service.files.mailname2.name": "/etc/mailname2", + "services.test_service.files.mailname2.activate": true, + "services.test_service.activate": true, + "services.test_service.manage": true } diff --git a/tests/dictionaries/40ifin_leadershipauto_follower/makedict/before.json b/tests/dictionaries/40ifin_leadershipauto_follower/makedict/before.json index c78d6ab1..134760c6 100644 --- a/tests/dictionaries/40ifin_leadershipauto_follower/makedict/before.json +++ b/tests/dictionaries/40ifin_leadershipauto_follower/makedict/before.json @@ -34,27 +34,27 @@ null ] }, - "services.test.files.mailname.name": { + "services.test_service.files.mailname.name": { "owner": "default", "value": "/etc/mailname" }, - "services.test.files.mailname.activate": { + "services.test_service.files.mailname.activate": { "owner": "default", "value": true }, - "services.test.files.mailname2.name": { + "services.test_service.files.mailname2.name": { "owner": "default", "value": "/etc/mailname2" }, - "services.test.files.mailname2.activate": { + "services.test_service.files.mailname2.activate": { "owner": "default", "value": true }, - "services.test.activate": { + "services.test_service.activate": { "owner": "default", "value": true }, - "services.test.manage": { + "services.test_service.manage": { "owner": "default", "value": true } diff --git a/tests/dictionaries/40ifin_leadershipauto_follower/tiramisu/base.py b/tests/dictionaries/40ifin_leadershipauto_follower/tiramisu/base.py index 84b02ca5..7dcdabd4 100644 --- a/tests/dictionaries/40ifin_leadershipauto_follower/tiramisu/base.py +++ b/tests/dictionaries/40ifin_leadershipauto_follower/tiramisu/base.py @@ -34,6 +34,6 @@ option_15.impl_set_information('source', "mailname2") option_11 = OptionDescription(name="files", doc="files", children=[option_12, option_15]) option_18 = BoolOption(name="activate", doc="activate", default=True) option_19 = BoolOption(name="manage", doc="manage", default=True) -option_10 = OptionDescription(name="test", doc="test", children=[option_11, option_18, option_19]) +option_10 = OptionDescription(name="test_service", doc="test.service", children=[option_11, option_18, option_19]) option_9 = OptionDescription(name="services", doc="services", children=[option_10], properties=frozenset({"hidden"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, option_9]) diff --git a/tests/dictionaries/45extra_without_family/makedict/after.json b/tests/dictionaries/45extra_without_family/makedict/after.json index 648d84a6..78372735 100644 --- a/tests/dictionaries/45extra_without_family/makedict/after.json +++ b/tests/dictionaries/45extra_without_family/makedict/after.json @@ -7,19 +7,19 @@ "owner": "default", "value": null }, - "services.test.files.file.name": { + "services.test_service.files.file.name": { "owner": "default", "value": "/etc/file" }, - "services.test.files.file.activate": { + "services.test_service.files.file.activate": { "owner": "default", "value": true }, - "services.test.activate": { + "services.test_service.activate": { "owner": "default", "value": true }, - "services.test.manage": { + "services.test_service.manage": { "owner": "default", "value": true } diff --git a/tests/dictionaries/45extra_without_family/makedict/base.json b/tests/dictionaries/45extra_without_family/makedict/base.json index 645b9a2d..6db8d1a0 100644 --- a/tests/dictionaries/45extra_without_family/makedict/base.json +++ b/tests/dictionaries/45extra_without_family/makedict/base.json @@ -1,8 +1,8 @@ { "rougail.my_var": "rougail", "extra.my_var": null, - "services.test.files.file.name": "/etc/file", - "services.test.files.file.activate": true, - "services.test.activate": true, - "services.test.manage": true + "services.test_service.files.file.name": "/etc/file", + "services.test_service.files.file.activate": true, + "services.test_service.activate": true, + "services.test_service.manage": true } diff --git a/tests/dictionaries/45extra_without_family/makedict/before.json b/tests/dictionaries/45extra_without_family/makedict/before.json index 648d84a6..78372735 100644 --- a/tests/dictionaries/45extra_without_family/makedict/before.json +++ b/tests/dictionaries/45extra_without_family/makedict/before.json @@ -7,19 +7,19 @@ "owner": "default", "value": null }, - "services.test.files.file.name": { + "services.test_service.files.file.name": { "owner": "default", "value": "/etc/file" }, - "services.test.files.file.activate": { + "services.test_service.files.file.activate": { "owner": "default", "value": true }, - "services.test.activate": { + "services.test_service.activate": { "owner": "default", "value": true }, - "services.test.manage": { + "services.test_service.manage": { "owner": "default", "value": true } diff --git a/tests/dictionaries/45extra_without_family/tiramisu/base.py b/tests/dictionaries/45extra_without_family/tiramisu/base.py index 5127a376..09d7b799 100644 --- a/tests/dictionaries/45extra_without_family/tiramisu/base.py +++ b/tests/dictionaries/45extra_without_family/tiramisu/base.py @@ -25,6 +25,6 @@ option_8.impl_set_information('source', "file") option_7 = OptionDescription(name="files", doc="files", children=[option_8]) option_11 = BoolOption(name="activate", doc="activate", 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_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, option_3, option_5]) diff --git a/tests/dictionaries/51redefine_remove_condition_filelist/makedict/after.json b/tests/dictionaries/51redefine_remove_condition_filelist/makedict/after.json index f1d0883a..87248916 100644 --- a/tests/dictionaries/51redefine_remove_condition_filelist/makedict/after.json +++ b/tests/dictionaries/51redefine_remove_condition_filelist/makedict/after.json @@ -15,19 +15,19 @@ "owner": "default", "value": "non" }, - "services.test.files.file.name": { + "services.test_service.files.file.name": { "owner": "default", "value": "/etc/file" }, - "services.test.files.file.activate": { + "services.test_service.files.file.activate": { "owner": "default", "value": true }, - "services.test.activate": { + "services.test_service.activate": { "owner": "default", "value": true }, - "services.test.manage": { + "services.test_service.manage": { "owner": "default", "value": true } diff --git a/tests/dictionaries/51redefine_remove_condition_filelist/makedict/base.json b/tests/dictionaries/51redefine_remove_condition_filelist/makedict/base.json index b78a39dc..7bf71af2 100644 --- a/tests/dictionaries/51redefine_remove_condition_filelist/makedict/base.json +++ b/tests/dictionaries/51redefine_remove_condition_filelist/makedict/base.json @@ -3,8 +3,8 @@ "rougail.general.condition": "non", "rougail.general.mode_conteneur_actif1": "non", "rougail.general.mode_conteneur_actif2": "non", - "services.test.files.file.name": "/etc/file", - "services.test.files.file.activate": true, - "services.test.activate": true, - "services.test.manage": true + "services.test_service.files.file.name": "/etc/file", + "services.test_service.files.file.activate": true, + "services.test_service.activate": true, + "services.test_service.manage": true } diff --git a/tests/dictionaries/51redefine_remove_condition_filelist/makedict/before.json b/tests/dictionaries/51redefine_remove_condition_filelist/makedict/before.json index f1d0883a..87248916 100644 --- a/tests/dictionaries/51redefine_remove_condition_filelist/makedict/before.json +++ b/tests/dictionaries/51redefine_remove_condition_filelist/makedict/before.json @@ -15,19 +15,19 @@ "owner": "default", "value": "non" }, - "services.test.files.file.name": { + "services.test_service.files.file.name": { "owner": "default", "value": "/etc/file" }, - "services.test.files.file.activate": { + "services.test_service.files.file.activate": { "owner": "default", "value": true }, - "services.test.activate": { + "services.test_service.activate": { "owner": "default", "value": true }, - "services.test.manage": { + "services.test_service.manage": { "owner": "default", "value": true } diff --git a/tests/dictionaries/51redefine_remove_condition_filelist/tiramisu/base.py b/tests/dictionaries/51redefine_remove_condition_filelist/tiramisu/base.py index 79ad8bb3..68a5e042 100644 --- a/tests/dictionaries/51redefine_remove_condition_filelist/tiramisu/base.py +++ b/tests/dictionaries/51redefine_remove_condition_filelist/tiramisu/base.py @@ -27,6 +27,6 @@ option_10.impl_set_information('source', "file") option_9 = OptionDescription(name="files", doc="files", children=[option_10]) option_13 = BoolOption(name="activate", doc="activate", default=True) option_14 = BoolOption(name="manage", doc="manage", default=True) -option_8 = OptionDescription(name="test", doc="test", children=[option_9, option_13, option_14]) +option_8 = OptionDescription(name="test_service", doc="test.service", children=[option_9, option_13, option_14]) option_7 = OptionDescription(name="services", doc="services", children=[option_8], properties=frozenset({"hidden"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, option_7]) diff --git a/tests/dictionaries/60extra_help/makedict/after.json b/tests/dictionaries/60extra_help/makedict/after.json index 6cf540ce..f6974796 100644 --- a/tests/dictionaries/60extra_help/makedict/after.json +++ b/tests/dictionaries/60extra_help/makedict/after.json @@ -19,19 +19,19 @@ "owner": "default", "value": "pre" }, - "services.test.files.mailname.name": { + "services.test_service.files.mailname.name": { "owner": "default", "value": "/etc/mailname" }, - "services.test.files.mailname.activate": { + "services.test_service.files.mailname.activate": { "owner": "default", "value": true }, - "services.test.activate": { + "services.test_service.activate": { "owner": "default", "value": true }, - "services.test.manage": { + "services.test_service.manage": { "owner": "default", "value": true } diff --git a/tests/dictionaries/60extra_help/makedict/base.json b/tests/dictionaries/60extra_help/makedict/base.json index 37a6c4d4..3c55fcf7 100644 --- a/tests/dictionaries/60extra_help/makedict/base.json +++ b/tests/dictionaries/60extra_help/makedict/base.json @@ -4,8 +4,8 @@ "extra.ejabberd.description": "Exportation de la base de ejabberd", "extra.ejabberd.day": null, "extra.ejabberd.mode": "pre", - "services.test.files.mailname.name": "/etc/mailname", - "services.test.files.mailname.activate": true, - "services.test.activate": true, - "services.test.manage": true + "services.test_service.files.mailname.name": "/etc/mailname", + "services.test_service.files.mailname.activate": true, + "services.test_service.activate": true, + "services.test_service.manage": true } diff --git a/tests/dictionaries/60extra_help/makedict/before.json b/tests/dictionaries/60extra_help/makedict/before.json index 6cf540ce..f6974796 100644 --- a/tests/dictionaries/60extra_help/makedict/before.json +++ b/tests/dictionaries/60extra_help/makedict/before.json @@ -19,19 +19,19 @@ "owner": "default", "value": "pre" }, - "services.test.files.mailname.name": { + "services.test_service.files.mailname.name": { "owner": "default", "value": "/etc/mailname" }, - "services.test.files.mailname.activate": { + "services.test_service.files.mailname.activate": { "owner": "default", "value": true }, - "services.test.activate": { + "services.test_service.activate": { "owner": "default", "value": true }, - "services.test.manage": { + "services.test_service.manage": { "owner": "default", "value": true } diff --git a/tests/dictionaries/60extra_help/tiramisu/base.py b/tests/dictionaries/60extra_help/tiramisu/base.py index 84160d5a..ef1e52d1 100644 --- a/tests/dictionaries/60extra_help/tiramisu/base.py +++ b/tests/dictionaries/60extra_help/tiramisu/base.py @@ -31,6 +31,6 @@ option_13.impl_set_information('source', "mailname") option_12 = OptionDescription(name="files", doc="files", children=[option_13]) option_16 = BoolOption(name="activate", doc="activate", default=True) option_17 = BoolOption(name="manage", doc="manage", default=True) -option_11 = OptionDescription(name="test", doc="test", children=[option_12, option_16, option_17]) +option_11 = OptionDescription(name="test_service", doc="test.service", children=[option_12, option_16, option_17]) option_10 = OptionDescription(name="services", doc="services", children=[option_11], properties=frozenset({"hidden"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, option_5, option_10]) diff --git a/tests/dictionaries/60extra_leadership/makedict/after.json b/tests/dictionaries/60extra_leadership/makedict/after.json index 7a0fe4a1..c6143a3c 100644 --- a/tests/dictionaries/60extra_leadership/makedict/after.json +++ b/tests/dictionaries/60extra_leadership/makedict/after.json @@ -21,27 +21,27 @@ "pre" ] }, - "services.test.files.mailname.name": { + "services.test_service.files.mailname.name": { "owner": "default", "value": "/etc/mailname" }, - "services.test.files.mailname.activate": { + "services.test_service.files.mailname.activate": { "owner": "default", "value": true }, - "services.test.files.mailname2.name": { + "services.test_service.files.mailname2.name": { "owner": "default", "value": "/etc/mailname2" }, - "services.test.files.mailname2.activate": { + "services.test_service.files.mailname2.activate": { "owner": "default", "value": true }, - "services.test.activate": { + "services.test_service.activate": { "owner": "default", "value": true }, - "services.test.manage": { + "services.test_service.manage": { "owner": "default", "value": true } diff --git a/tests/dictionaries/60extra_leadership/makedict/base.json b/tests/dictionaries/60extra_leadership/makedict/base.json index bbab96af..03deab1b 100644 --- a/tests/dictionaries/60extra_leadership/makedict/base.json +++ b/tests/dictionaries/60extra_leadership/makedict/base.json @@ -7,10 +7,10 @@ "extra.ejabberd.leadership.mode": "pre" } ], - "services.test.files.mailname.name": "/etc/mailname", - "services.test.files.mailname.activate": true, - "services.test.files.mailname2.name": "/etc/mailname2", - "services.test.files.mailname2.activate": true, - "services.test.activate": true, - "services.test.manage": true + "services.test_service.files.mailname.name": "/etc/mailname", + "services.test_service.files.mailname.activate": true, + "services.test_service.files.mailname2.name": "/etc/mailname2", + "services.test_service.files.mailname2.activate": true, + "services.test_service.activate": true, + "services.test_service.manage": true } diff --git a/tests/dictionaries/60extra_leadership/makedict/before.json b/tests/dictionaries/60extra_leadership/makedict/before.json index 7a0fe4a1..c6143a3c 100644 --- a/tests/dictionaries/60extra_leadership/makedict/before.json +++ b/tests/dictionaries/60extra_leadership/makedict/before.json @@ -21,27 +21,27 @@ "pre" ] }, - "services.test.files.mailname.name": { + "services.test_service.files.mailname.name": { "owner": "default", "value": "/etc/mailname" }, - "services.test.files.mailname.activate": { + "services.test_service.files.mailname.activate": { "owner": "default", "value": true }, - "services.test.files.mailname2.name": { + "services.test_service.files.mailname2.name": { "owner": "default", "value": "/etc/mailname2" }, - "services.test.files.mailname2.activate": { + "services.test_service.files.mailname2.activate": { "owner": "default", "value": true }, - "services.test.activate": { + "services.test_service.activate": { "owner": "default", "value": true }, - "services.test.manage": { + "services.test_service.manage": { "owner": "default", "value": true } diff --git a/tests/dictionaries/60extra_leadership/tiramisu/base.py b/tests/dictionaries/60extra_leadership/tiramisu/base.py index a34ef188..9181de83 100644 --- a/tests/dictionaries/60extra_leadership/tiramisu/base.py +++ b/tests/dictionaries/60extra_leadership/tiramisu/base.py @@ -35,6 +35,6 @@ option_16.impl_set_information('source', "mailname2") option_12 = OptionDescription(name="files", doc="files", children=[option_13, option_16]) option_19 = BoolOption(name="activate", doc="activate", default=True) option_20 = BoolOption(name="manage", doc="manage", default=True) -option_11 = OptionDescription(name="test", doc="test", children=[option_12, option_19, option_20]) +option_11 = OptionDescription(name="test_service", doc="test.service", children=[option_12, option_19, option_20]) option_10 = OptionDescription(name="services", doc="services", children=[option_11], properties=frozenset({"hidden"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, option_5, option_10]) diff --git a/tests/dictionaries/60extra_leadership_name/makedict/after.json b/tests/dictionaries/60extra_leadership_name/makedict/after.json index 706146a9..64cba9b4 100644 --- a/tests/dictionaries/60extra_leadership_name/makedict/after.json +++ b/tests/dictionaries/60extra_leadership_name/makedict/after.json @@ -21,27 +21,27 @@ "pre" ] }, - "services.test.files.mailname.name": { + "services.test_service.files.mailname.name": { "owner": "default", "value": "/etc/mailname" }, - "services.test.files.mailname.activate": { + "services.test_service.files.mailname.activate": { "owner": "default", "value": true }, - "services.test.files.mailname2.name": { + "services.test_service.files.mailname2.name": { "owner": "default", "value": "/etc/mailname2" }, - "services.test.files.mailname2.activate": { + "services.test_service.files.mailname2.activate": { "owner": "default", "value": true }, - "services.test.activate": { + "services.test_service.activate": { "owner": "default", "value": true }, - "services.test.manage": { + "services.test_service.manage": { "owner": "default", "value": true } diff --git a/tests/dictionaries/60extra_leadership_name/makedict/base.json b/tests/dictionaries/60extra_leadership_name/makedict/base.json index 5e9f4d0f..ade30817 100644 --- a/tests/dictionaries/60extra_leadership_name/makedict/base.json +++ b/tests/dictionaries/60extra_leadership_name/makedict/base.json @@ -7,10 +7,10 @@ "extra.ejabberd.new_name.mode": "pre" } ], - "services.test.files.mailname.name": "/etc/mailname", - "services.test.files.mailname.activate": true, - "services.test.files.mailname2.name": "/etc/mailname2", - "services.test.files.mailname2.activate": true, - "services.test.activate": true, - "services.test.manage": true + "services.test_service.files.mailname.name": "/etc/mailname", + "services.test_service.files.mailname.activate": true, + "services.test_service.files.mailname2.name": "/etc/mailname2", + "services.test_service.files.mailname2.activate": true, + "services.test_service.activate": true, + "services.test_service.manage": true } diff --git a/tests/dictionaries/60extra_leadership_name/makedict/before.json b/tests/dictionaries/60extra_leadership_name/makedict/before.json index 706146a9..64cba9b4 100644 --- a/tests/dictionaries/60extra_leadership_name/makedict/before.json +++ b/tests/dictionaries/60extra_leadership_name/makedict/before.json @@ -21,27 +21,27 @@ "pre" ] }, - "services.test.files.mailname.name": { + "services.test_service.files.mailname.name": { "owner": "default", "value": "/etc/mailname" }, - "services.test.files.mailname.activate": { + "services.test_service.files.mailname.activate": { "owner": "default", "value": true }, - "services.test.files.mailname2.name": { + "services.test_service.files.mailname2.name": { "owner": "default", "value": "/etc/mailname2" }, - "services.test.files.mailname2.activate": { + "services.test_service.files.mailname2.activate": { "owner": "default", "value": true }, - "services.test.activate": { + "services.test_service.activate": { "owner": "default", "value": true }, - "services.test.manage": { + "services.test_service.manage": { "owner": "default", "value": true } diff --git a/tests/dictionaries/60extra_leadership_name/tiramisu/base.py b/tests/dictionaries/60extra_leadership_name/tiramisu/base.py index f0715ce2..7f368536 100644 --- a/tests/dictionaries/60extra_leadership_name/tiramisu/base.py +++ b/tests/dictionaries/60extra_leadership_name/tiramisu/base.py @@ -35,6 +35,6 @@ option_16.impl_set_information('source', "mailname2") option_12 = OptionDescription(name="files", doc="files", children=[option_13, option_16]) option_19 = BoolOption(name="activate", doc="activate", default=True) option_20 = BoolOption(name="manage", doc="manage", default=True) -option_11 = OptionDescription(name="test", doc="test", children=[option_12, option_19, option_20]) +option_11 = OptionDescription(name="test_service", doc="test.service", children=[option_12, option_19, option_20]) option_10 = OptionDescription(name="services", doc="services", children=[option_11], properties=frozenset({"hidden"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, option_5, option_10]) diff --git a/tests/dictionaries/60extra_leadership_name_item/makedict/after.json b/tests/dictionaries/60extra_leadership_name_item/makedict/after.json index 706146a9..64cba9b4 100644 --- a/tests/dictionaries/60extra_leadership_name_item/makedict/after.json +++ b/tests/dictionaries/60extra_leadership_name_item/makedict/after.json @@ -21,27 +21,27 @@ "pre" ] }, - "services.test.files.mailname.name": { + "services.test_service.files.mailname.name": { "owner": "default", "value": "/etc/mailname" }, - "services.test.files.mailname.activate": { + "services.test_service.files.mailname.activate": { "owner": "default", "value": true }, - "services.test.files.mailname2.name": { + "services.test_service.files.mailname2.name": { "owner": "default", "value": "/etc/mailname2" }, - "services.test.files.mailname2.activate": { + "services.test_service.files.mailname2.activate": { "owner": "default", "value": true }, - "services.test.activate": { + "services.test_service.activate": { "owner": "default", "value": true }, - "services.test.manage": { + "services.test_service.manage": { "owner": "default", "value": true } diff --git a/tests/dictionaries/60extra_leadership_name_item/makedict/base.json b/tests/dictionaries/60extra_leadership_name_item/makedict/base.json index 5e9f4d0f..ade30817 100644 --- a/tests/dictionaries/60extra_leadership_name_item/makedict/base.json +++ b/tests/dictionaries/60extra_leadership_name_item/makedict/base.json @@ -7,10 +7,10 @@ "extra.ejabberd.new_name.mode": "pre" } ], - "services.test.files.mailname.name": "/etc/mailname", - "services.test.files.mailname.activate": true, - "services.test.files.mailname2.name": "/etc/mailname2", - "services.test.files.mailname2.activate": true, - "services.test.activate": true, - "services.test.manage": true + "services.test_service.files.mailname.name": "/etc/mailname", + "services.test_service.files.mailname.activate": true, + "services.test_service.files.mailname2.name": "/etc/mailname2", + "services.test_service.files.mailname2.activate": true, + "services.test_service.activate": true, + "services.test_service.manage": true } diff --git a/tests/dictionaries/60extra_leadership_name_item/makedict/before.json b/tests/dictionaries/60extra_leadership_name_item/makedict/before.json index 706146a9..64cba9b4 100644 --- a/tests/dictionaries/60extra_leadership_name_item/makedict/before.json +++ b/tests/dictionaries/60extra_leadership_name_item/makedict/before.json @@ -21,27 +21,27 @@ "pre" ] }, - "services.test.files.mailname.name": { + "services.test_service.files.mailname.name": { "owner": "default", "value": "/etc/mailname" }, - "services.test.files.mailname.activate": { + "services.test_service.files.mailname.activate": { "owner": "default", "value": true }, - "services.test.files.mailname2.name": { + "services.test_service.files.mailname2.name": { "owner": "default", "value": "/etc/mailname2" }, - "services.test.files.mailname2.activate": { + "services.test_service.files.mailname2.activate": { "owner": "default", "value": true }, - "services.test.activate": { + "services.test_service.activate": { "owner": "default", "value": true }, - "services.test.manage": { + "services.test_service.manage": { "owner": "default", "value": true } diff --git a/tests/dictionaries/60extra_leadership_name_item/tiramisu/base.py b/tests/dictionaries/60extra_leadership_name_item/tiramisu/base.py index f0715ce2..7f368536 100644 --- a/tests/dictionaries/60extra_leadership_name_item/tiramisu/base.py +++ b/tests/dictionaries/60extra_leadership_name_item/tiramisu/base.py @@ -35,6 +35,6 @@ option_16.impl_set_information('source', "mailname2") option_12 = OptionDescription(name="files", doc="files", children=[option_13, option_16]) option_19 = BoolOption(name="activate", doc="activate", default=True) option_20 = BoolOption(name="manage", doc="manage", default=True) -option_11 = OptionDescription(name="test", doc="test", children=[option_12, option_19, option_20]) +option_11 = OptionDescription(name="test_service", doc="test.service", children=[option_12, option_19, option_20]) option_10 = OptionDescription(name="services", doc="services", children=[option_11], properties=frozenset({"hidden"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, option_5, option_10]) diff --git a/tests/dictionaries/60extra_leadership_valid_enum/makedict/after.json b/tests/dictionaries/60extra_leadership_valid_enum/makedict/after.json index 0295b3e4..62f8033f 100644 --- a/tests/dictionaries/60extra_leadership_valid_enum/makedict/after.json +++ b/tests/dictionaries/60extra_leadership_valid_enum/makedict/after.json @@ -21,27 +21,27 @@ "pre" ] }, - "services.test.files.mailname.name": { + "services.test_service.files.mailname.name": { "owner": "default", "value": "/etc/mailname" }, - "services.test.files.mailname.activate": { + "services.test_service.files.mailname.activate": { "owner": "default", "value": true }, - "services.test.files.mailname2.name": { + "services.test_service.files.mailname2.name": { "owner": "default", "value": "/etc/mailname2" }, - "services.test.files.mailname2.activate": { + "services.test_service.files.mailname2.activate": { "owner": "default", "value": true }, - "services.test.activate": { + "services.test_service.activate": { "owner": "default", "value": true }, - "services.test.manage": { + "services.test_service.manage": { "owner": "default", "value": true } diff --git a/tests/dictionaries/60extra_leadership_valid_enum/makedict/base.json b/tests/dictionaries/60extra_leadership_valid_enum/makedict/base.json index b67b1029..e488c639 100644 --- a/tests/dictionaries/60extra_leadership_valid_enum/makedict/base.json +++ b/tests/dictionaries/60extra_leadership_valid_enum/makedict/base.json @@ -7,10 +7,10 @@ "extra.ejabberd.description.mode": "pre" } ], - "services.test.files.mailname.name": "/etc/mailname", - "services.test.files.mailname.activate": true, - "services.test.files.mailname2.name": "/etc/mailname2", - "services.test.files.mailname2.activate": true, - "services.test.activate": true, - "services.test.manage": true + "services.test_service.files.mailname.name": "/etc/mailname", + "services.test_service.files.mailname.activate": true, + "services.test_service.files.mailname2.name": "/etc/mailname2", + "services.test_service.files.mailname2.activate": true, + "services.test_service.activate": true, + "services.test_service.manage": true } diff --git a/tests/dictionaries/60extra_leadership_valid_enum/makedict/before.json b/tests/dictionaries/60extra_leadership_valid_enum/makedict/before.json index 0295b3e4..62f8033f 100644 --- a/tests/dictionaries/60extra_leadership_valid_enum/makedict/before.json +++ b/tests/dictionaries/60extra_leadership_valid_enum/makedict/before.json @@ -21,27 +21,27 @@ "pre" ] }, - "services.test.files.mailname.name": { + "services.test_service.files.mailname.name": { "owner": "default", "value": "/etc/mailname" }, - "services.test.files.mailname.activate": { + "services.test_service.files.mailname.activate": { "owner": "default", "value": true }, - "services.test.files.mailname2.name": { + "services.test_service.files.mailname2.name": { "owner": "default", "value": "/etc/mailname2" }, - "services.test.files.mailname2.activate": { + "services.test_service.files.mailname2.activate": { "owner": "default", "value": true }, - "services.test.activate": { + "services.test_service.activate": { "owner": "default", "value": true }, - "services.test.manage": { + "services.test_service.manage": { "owner": "default", "value": true } diff --git a/tests/dictionaries/60extra_leadership_valid_enum/tiramisu/base.py b/tests/dictionaries/60extra_leadership_valid_enum/tiramisu/base.py index abfcf2b8..a2756b23 100644 --- a/tests/dictionaries/60extra_leadership_valid_enum/tiramisu/base.py +++ b/tests/dictionaries/60extra_leadership_valid_enum/tiramisu/base.py @@ -35,6 +35,6 @@ option_16.impl_set_information('source', "mailname2") option_12 = OptionDescription(name="files", doc="files", children=[option_13, option_16]) option_19 = BoolOption(name="activate", doc="activate", default=True) option_20 = BoolOption(name="manage", doc="manage", default=True) -option_11 = OptionDescription(name="test", doc="test", children=[option_12, option_19, option_20]) +option_11 = OptionDescription(name="test_service", doc="test.service", children=[option_12, option_19, option_20]) option_10 = OptionDescription(name="services", doc="services", children=[option_11], properties=frozenset({"hidden"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, option_5, option_10]) diff --git a/tests/dictionaries/70container_files/makedict/after.json b/tests/dictionaries/70container_files/makedict/after.json index 0329a8b5..9d4efda5 100644 --- a/tests/dictionaries/70container_files/makedict/after.json +++ b/tests/dictionaries/70container_files/makedict/after.json @@ -3,27 +3,27 @@ "owner": "default", "value": "oui" }, - "services.test.files.mailname.name": { + "services.test_service.files.mailname.name": { "owner": "default", "value": "/etc/mailname" }, - "services.test.files.mailname.activate": { + "services.test_service.files.mailname.activate": { "owner": "default", "value": true }, - "services.test.files.rougail_conf.name": { + "services.test_service.files.rougail_conf.name": { "owner": "default", "value": "/rougail.conf" }, - "services.test.files.rougail_conf.activate": { + "services.test_service.files.rougail_conf.activate": { "owner": "default", "value": true }, - "services.test.activate": { + "services.test_service.activate": { "owner": "default", "value": true }, - "services.test.manage": { + "services.test_service.manage": { "owner": "default", "value": true } diff --git a/tests/dictionaries/70container_files/makedict/base.json b/tests/dictionaries/70container_files/makedict/base.json index ab53f2b8..81a32996 100644 --- a/tests/dictionaries/70container_files/makedict/base.json +++ b/tests/dictionaries/70container_files/makedict/base.json @@ -1,9 +1,9 @@ { "rougail.general.mode_conteneur_actif": "oui", - "services.test.files.mailname.name": "/etc/mailname", - "services.test.files.mailname.activate": true, - "services.test.files.rougail_conf.name": "/rougail.conf", - "services.test.files.rougail_conf.activate": true, - "services.test.activate": true, - "services.test.manage": true + "services.test_service.files.mailname.name": "/etc/mailname", + "services.test_service.files.mailname.activate": true, + "services.test_service.files.rougail_conf.name": "/rougail.conf", + "services.test_service.files.rougail_conf.activate": true, + "services.test_service.activate": true, + "services.test_service.manage": true } diff --git a/tests/dictionaries/70container_files/makedict/before.json b/tests/dictionaries/70container_files/makedict/before.json index 0329a8b5..9d4efda5 100644 --- a/tests/dictionaries/70container_files/makedict/before.json +++ b/tests/dictionaries/70container_files/makedict/before.json @@ -3,27 +3,27 @@ "owner": "default", "value": "oui" }, - "services.test.files.mailname.name": { + "services.test_service.files.mailname.name": { "owner": "default", "value": "/etc/mailname" }, - "services.test.files.mailname.activate": { + "services.test_service.files.mailname.activate": { "owner": "default", "value": true }, - "services.test.files.rougail_conf.name": { + "services.test_service.files.rougail_conf.name": { "owner": "default", "value": "/rougail.conf" }, - "services.test.files.rougail_conf.activate": { + "services.test_service.files.rougail_conf.activate": { "owner": "default", "value": true }, - "services.test.activate": { + "services.test_service.activate": { "owner": "default", "value": true }, - "services.test.manage": { + "services.test_service.manage": { "owner": "default", "value": true } diff --git a/tests/dictionaries/70container_files/tiramisu/base.py b/tests/dictionaries/70container_files/tiramisu/base.py index 4d76cc70..2dac800e 100644 --- a/tests/dictionaries/70container_files/tiramisu/base.py +++ b/tests/dictionaries/70container_files/tiramisu/base.py @@ -28,6 +28,6 @@ option_10.impl_set_information('source', "rougail.conf") option_6 = OptionDescription(name="files", doc="files", children=[option_7, option_10]) option_13 = BoolOption(name="activate", doc="activate", 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_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, option_4]) diff --git a/tests/dictionaries/70container_files_symlink_multi/makedict/after.json b/tests/dictionaries/70container_files_symlink_multi/makedict/after.json index 38b626a1..0a605e39 100644 --- a/tests/dictionaries/70container_files_symlink_multi/makedict/after.json +++ b/tests/dictionaries/70container_files_symlink_multi/makedict/after.json @@ -13,33 +13,33 @@ "/etc/mailname4" ] }, - "services.test.files.mailname.name": { + "services.test_service.files.mailname.name": { "owner": "default", "value": [ "/etc/mailname", "/etc/mailname2" ] }, - "services.test.files.mailname.activate": { + "services.test_service.files.mailname.activate": { "owner": "default", "value": true }, - "services.test.files.mailname2.name": { + "services.test_service.files.mailname2.name": { "owner": "default", "value": [ "/etc/mailname3", "/etc/mailname4" ] }, - "services.test.files.mailname2.activate": { + "services.test_service.files.mailname2.activate": { "owner": "default", "value": true }, - "services.test.activate": { + "services.test_service.activate": { "owner": "default", "value": true }, - "services.test.manage": { + "services.test_service.manage": { "owner": "default", "value": true } diff --git a/tests/dictionaries/70container_files_symlink_multi/makedict/base.json b/tests/dictionaries/70container_files_symlink_multi/makedict/base.json index ca49f33b..164d5588 100644 --- a/tests/dictionaries/70container_files_symlink_multi/makedict/base.json +++ b/tests/dictionaries/70container_files_symlink_multi/makedict/base.json @@ -7,16 +7,16 @@ "/etc/mailname3", "/etc/mailname4" ], - "services.test.files.mailname.name": [ + "services.test_service.files.mailname.name": [ "/etc/mailname", "/etc/mailname2" ], - "services.test.files.mailname.activate": true, - "services.test.files.mailname2.name": [ + "services.test_service.files.mailname.activate": true, + "services.test_service.files.mailname2.name": [ "/etc/mailname3", "/etc/mailname4" ], - "services.test.files.mailname2.activate": true, - "services.test.activate": true, - "services.test.manage": true + "services.test_service.files.mailname2.activate": true, + "services.test_service.activate": true, + "services.test_service.manage": true } diff --git a/tests/dictionaries/70container_files_symlink_multi/makedict/before.json b/tests/dictionaries/70container_files_symlink_multi/makedict/before.json index 38b626a1..0a605e39 100644 --- a/tests/dictionaries/70container_files_symlink_multi/makedict/before.json +++ b/tests/dictionaries/70container_files_symlink_multi/makedict/before.json @@ -13,33 +13,33 @@ "/etc/mailname4" ] }, - "services.test.files.mailname.name": { + "services.test_service.files.mailname.name": { "owner": "default", "value": [ "/etc/mailname", "/etc/mailname2" ] }, - "services.test.files.mailname.activate": { + "services.test_service.files.mailname.activate": { "owner": "default", "value": true }, - "services.test.files.mailname2.name": { + "services.test_service.files.mailname2.name": { "owner": "default", "value": [ "/etc/mailname3", "/etc/mailname4" ] }, - "services.test.files.mailname2.activate": { + "services.test_service.files.mailname2.activate": { "owner": "default", "value": true }, - "services.test.activate": { + "services.test_service.activate": { "owner": "default", "value": true }, - "services.test.manage": { + "services.test_service.manage": { "owner": "default", "value": true } diff --git a/tests/dictionaries/70container_files_symlink_multi/tiramisu/base.py b/tests/dictionaries/70container_files_symlink_multi/tiramisu/base.py index 3f0ba1af..3ea1f8ac 100644 --- a/tests/dictionaries/70container_files_symlink_multi/tiramisu/base.py +++ b/tests/dictionaries/70container_files_symlink_multi/tiramisu/base.py @@ -29,6 +29,6 @@ option_10.impl_set_information('source', "mailname2") option_6 = OptionDescription(name="files", doc="files", children=[option_7, option_10]) option_13 = BoolOption(name="activate", doc="activate", 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_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, option_4]) diff --git a/tests/dictionaries/70container_files_symlink_multi_variable/makedict/after.json b/tests/dictionaries/70container_files_symlink_multi_variable/makedict/after.json index 85f10914..ad2997ca 100644 --- a/tests/dictionaries/70container_files_symlink_multi_variable/makedict/after.json +++ b/tests/dictionaries/70container_files_symlink_multi_variable/makedict/after.json @@ -20,47 +20,47 @@ "mailname2" ] }, - "services.test.files.mailname.name": { + "services.test_service.files.mailname.name": { "owner": "default", "value": [ "/etc/mailname", "/etc/mailname2" ] }, - "services.test.files.mailname.variable": { + "services.test_service.files.mailname.variable": { "owner": "default", "value": [ "mailname", "mailname2" ] }, - "services.test.files.mailname.activate": { + "services.test_service.files.mailname.activate": { "owner": "default", "value": true }, - "services.test.files.mailname2.name": { + "services.test_service.files.mailname2.name": { "owner": "default", "value": [ "/etc/mailname3", "/etc/mailname4" ] }, - "services.test.files.mailname2.variable": { + "services.test_service.files.mailname2.variable": { "owner": "default", "value": [ "mailname", "mailname2" ] }, - "services.test.files.mailname2.activate": { + "services.test_service.files.mailname2.activate": { "owner": "default", "value": true }, - "services.test.activate": { + "services.test_service.activate": { "owner": "default", "value": true }, - "services.test.manage": { + "services.test_service.manage": { "owner": "default", "value": true } diff --git a/tests/dictionaries/70container_files_symlink_multi_variable/makedict/base.json b/tests/dictionaries/70container_files_symlink_multi_variable/makedict/base.json index 3d2fce35..a3fcba14 100644 --- a/tests/dictionaries/70container_files_symlink_multi_variable/makedict/base.json +++ b/tests/dictionaries/70container_files_symlink_multi_variable/makedict/base.json @@ -11,24 +11,24 @@ "mailname", "mailname2" ], - "services.test.files.mailname.name": [ + "services.test_service.files.mailname.name": [ "/etc/mailname", "/etc/mailname2" ], - "services.test.files.mailname.variable": [ + "services.test_service.files.mailname.variable": [ "mailname", "mailname2" ], - "services.test.files.mailname.activate": true, - "services.test.files.mailname2.name": [ + "services.test_service.files.mailname.activate": true, + "services.test_service.files.mailname2.name": [ "/etc/mailname3", "/etc/mailname4" ], - "services.test.files.mailname2.variable": [ + "services.test_service.files.mailname2.variable": [ "mailname", "mailname2" ], - "services.test.files.mailname2.activate": true, - "services.test.activate": true, - "services.test.manage": true + "services.test_service.files.mailname2.activate": true, + "services.test_service.activate": true, + "services.test_service.manage": true } diff --git a/tests/dictionaries/70container_files_symlink_multi_variable/makedict/before.json b/tests/dictionaries/70container_files_symlink_multi_variable/makedict/before.json index 85f10914..ad2997ca 100644 --- a/tests/dictionaries/70container_files_symlink_multi_variable/makedict/before.json +++ b/tests/dictionaries/70container_files_symlink_multi_variable/makedict/before.json @@ -20,47 +20,47 @@ "mailname2" ] }, - "services.test.files.mailname.name": { + "services.test_service.files.mailname.name": { "owner": "default", "value": [ "/etc/mailname", "/etc/mailname2" ] }, - "services.test.files.mailname.variable": { + "services.test_service.files.mailname.variable": { "owner": "default", "value": [ "mailname", "mailname2" ] }, - "services.test.files.mailname.activate": { + "services.test_service.files.mailname.activate": { "owner": "default", "value": true }, - "services.test.files.mailname2.name": { + "services.test_service.files.mailname2.name": { "owner": "default", "value": [ "/etc/mailname3", "/etc/mailname4" ] }, - "services.test.files.mailname2.variable": { + "services.test_service.files.mailname2.variable": { "owner": "default", "value": [ "mailname", "mailname2" ] }, - "services.test.files.mailname2.activate": { + "services.test_service.files.mailname2.activate": { "owner": "default", "value": true }, - "services.test.activate": { + "services.test_service.activate": { "owner": "default", "value": true }, - "services.test.manage": { + "services.test_service.manage": { "owner": "default", "value": true } diff --git a/tests/dictionaries/70container_files_symlink_multi_variable/tiramisu/base.py b/tests/dictionaries/70container_files_symlink_multi_variable/tiramisu/base.py index 7f879790..787c8a13 100644 --- a/tests/dictionaries/70container_files_symlink_multi_variable/tiramisu/base.py +++ b/tests/dictionaries/70container_files_symlink_multi_variable/tiramisu/base.py @@ -32,6 +32,6 @@ option_12.impl_set_information('source', "mailname2") option_7 = OptionDescription(name="files", doc="files", children=[option_8, option_12]) option_16 = BoolOption(name="activate", doc="activate", default=True) option_17 = BoolOption(name="manage", doc="manage", default=True) -option_6 = OptionDescription(name="test", doc="test", children=[option_7, option_16, option_17]) +option_6 = OptionDescription(name="test_service", doc="test.service", children=[option_7, option_16, option_17]) 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]) diff --git a/tests/dictionaries/70container_files_symlink_variable/makedict/after.json b/tests/dictionaries/70container_files_symlink_variable/makedict/after.json index 06490541..f8d4af35 100644 --- a/tests/dictionaries/70container_files_symlink_variable/makedict/after.json +++ b/tests/dictionaries/70container_files_symlink_variable/makedict/after.json @@ -7,23 +7,23 @@ "owner": "default", "value": "mailname" }, - "services.test.files.mailname.name": { + "services.test_service.files.mailname.name": { "owner": "default", "value": "/etc/mailname" }, - "services.test.files.mailname.variable": { + "services.test_service.files.mailname.variable": { "owner": "default", "value": "mailname" }, - "services.test.files.mailname.activate": { + "services.test_service.files.mailname.activate": { "owner": "default", "value": true }, - "services.test.activate": { + "services.test_service.activate": { "owner": "default", "value": true }, - "services.test.manage": { + "services.test_service.manage": { "owner": "default", "value": true } diff --git a/tests/dictionaries/70container_files_symlink_variable/makedict/base.json b/tests/dictionaries/70container_files_symlink_variable/makedict/base.json index 6f9a4fd0..60d31a0e 100644 --- a/tests/dictionaries/70container_files_symlink_variable/makedict/base.json +++ b/tests/dictionaries/70container_files_symlink_variable/makedict/base.json @@ -1,9 +1,9 @@ { "rougail.file_name": "/etc/mailname", "rougail.var": "mailname", - "services.test.files.mailname.name": "/etc/mailname", - "services.test.files.mailname.variable": "mailname", - "services.test.files.mailname.activate": true, - "services.test.activate": true, - "services.test.manage": true + "services.test_service.files.mailname.name": "/etc/mailname", + "services.test_service.files.mailname.variable": "mailname", + "services.test_service.files.mailname.activate": true, + "services.test_service.activate": true, + "services.test_service.manage": true } diff --git a/tests/dictionaries/70container_files_symlink_variable/makedict/before.json b/tests/dictionaries/70container_files_symlink_variable/makedict/before.json index 06490541..f8d4af35 100644 --- a/tests/dictionaries/70container_files_symlink_variable/makedict/before.json +++ b/tests/dictionaries/70container_files_symlink_variable/makedict/before.json @@ -7,23 +7,23 @@ "owner": "default", "value": "mailname" }, - "services.test.files.mailname.name": { + "services.test_service.files.mailname.name": { "owner": "default", "value": "/etc/mailname" }, - "services.test.files.mailname.variable": { + "services.test_service.files.mailname.variable": { "owner": "default", "value": "mailname" }, - "services.test.files.mailname.activate": { + "services.test_service.files.mailname.activate": { "owner": "default", "value": true }, - "services.test.activate": { + "services.test_service.activate": { "owner": "default", "value": true }, - "services.test.manage": { + "services.test_service.manage": { "owner": "default", "value": true } diff --git a/tests/dictionaries/70container_files_symlink_variable/tiramisu/base.py b/tests/dictionaries/70container_files_symlink_variable/tiramisu/base.py index a9921657..0424d539 100644 --- a/tests/dictionaries/70container_files_symlink_variable/tiramisu/base.py +++ b/tests/dictionaries/70container_files_symlink_variable/tiramisu/base.py @@ -25,6 +25,6 @@ option_7.impl_set_information('source', "mailname") option_6 = OptionDescription(name="files", doc="files", children=[option_7]) option_11 = BoolOption(name="activate", doc="activate", default=True) option_12 = BoolOption(name="manage", doc="manage", default=True) -option_5 = OptionDescription(name="test", doc="test", children=[option_6, option_11, option_12]) +option_5 = OptionDescription(name="test_service", doc="test.service", children=[option_6, option_11, option_12]) 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]) diff --git a/tests/dictionaries/70container_files_twice/makedict/after.json b/tests/dictionaries/70container_files_twice/makedict/after.json index 784f895b..d399ac9c 100644 --- a/tests/dictionaries/70container_files_twice/makedict/after.json +++ b/tests/dictionaries/70container_files_twice/makedict/after.json @@ -3,35 +3,35 @@ "owner": "default", "value": "oui" }, - "services.test.files.mailname.name": { + "services.test_service.files.mailname.name": { "owner": "default", "value": "/etc/mailname" }, - "services.test.files.mailname.activate": { + "services.test_service.files.mailname.activate": { "owner": "default", "value": true }, - "services.test.files.mailname_1.name": { + "services.test_service.files.mailname_1.name": { "owner": "default", "value": "/etc/eole/mailname" }, - "services.test.files.mailname_1.activate": { + "services.test_service.files.mailname_1.activate": { "owner": "default", "value": true }, - "services.test.files.rougail_conf.name": { + "services.test_service.files.rougail_conf.name": { "owner": "default", "value": "/rougail.conf" }, - "services.test.files.rougail_conf.activate": { + "services.test_service.files.rougail_conf.activate": { "owner": "default", "value": true }, - "services.test.activate": { + "services.test_service.activate": { "owner": "default", "value": true }, - "services.test.manage": { + "services.test_service.manage": { "owner": "default", "value": true } diff --git a/tests/dictionaries/70container_files_twice/makedict/base.json b/tests/dictionaries/70container_files_twice/makedict/base.json index 0022daab..e5f5dc70 100644 --- a/tests/dictionaries/70container_files_twice/makedict/base.json +++ b/tests/dictionaries/70container_files_twice/makedict/base.json @@ -1,11 +1,11 @@ { "rougail.general.mode_conteneur_actif": "oui", - "services.test.files.mailname.name": "/etc/mailname", - "services.test.files.mailname.activate": true, - "services.test.files.mailname_1.name": "/etc/eole/mailname", - "services.test.files.mailname_1.activate": true, - "services.test.files.rougail_conf.name": "/rougail.conf", - "services.test.files.rougail_conf.activate": true, - "services.test.activate": true, - "services.test.manage": true + "services.test_service.files.mailname.name": "/etc/mailname", + "services.test_service.files.mailname.activate": true, + "services.test_service.files.mailname_1.name": "/etc/eole/mailname", + "services.test_service.files.mailname_1.activate": true, + "services.test_service.files.rougail_conf.name": "/rougail.conf", + "services.test_service.files.rougail_conf.activate": true, + "services.test_service.activate": true, + "services.test_service.manage": true } diff --git a/tests/dictionaries/70container_files_twice/makedict/before.json b/tests/dictionaries/70container_files_twice/makedict/before.json index 784f895b..d399ac9c 100644 --- a/tests/dictionaries/70container_files_twice/makedict/before.json +++ b/tests/dictionaries/70container_files_twice/makedict/before.json @@ -3,35 +3,35 @@ "owner": "default", "value": "oui" }, - "services.test.files.mailname.name": { + "services.test_service.files.mailname.name": { "owner": "default", "value": "/etc/mailname" }, - "services.test.files.mailname.activate": { + "services.test_service.files.mailname.activate": { "owner": "default", "value": true }, - "services.test.files.mailname_1.name": { + "services.test_service.files.mailname_1.name": { "owner": "default", "value": "/etc/eole/mailname" }, - "services.test.files.mailname_1.activate": { + "services.test_service.files.mailname_1.activate": { "owner": "default", "value": true }, - "services.test.files.rougail_conf.name": { + "services.test_service.files.rougail_conf.name": { "owner": "default", "value": "/rougail.conf" }, - "services.test.files.rougail_conf.activate": { + "services.test_service.files.rougail_conf.activate": { "owner": "default", "value": true }, - "services.test.activate": { + "services.test_service.activate": { "owner": "default", "value": true }, - "services.test.manage": { + "services.test_service.manage": { "owner": "default", "value": true } diff --git a/tests/dictionaries/70container_files_twice/tiramisu/base.py b/tests/dictionaries/70container_files_twice/tiramisu/base.py index 9b57d156..60ede85a 100644 --- a/tests/dictionaries/70container_files_twice/tiramisu/base.py +++ b/tests/dictionaries/70container_files_twice/tiramisu/base.py @@ -32,6 +32,6 @@ option_13.impl_set_information('source', "rougail.conf") option_6 = OptionDescription(name="files", doc="files", children=[option_7, option_10, option_13]) option_16 = BoolOption(name="activate", doc="activate", 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_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, option_4]) diff --git a/tests/dictionaries/70container_filesmulti/makedict/after.json b/tests/dictionaries/70container_filesmulti/makedict/after.json index 24097e2e..3df6d974 100644 --- a/tests/dictionaries/70container_filesmulti/makedict/after.json +++ b/tests/dictionaries/70container_filesmulti/makedict/after.json @@ -3,27 +3,27 @@ "owner": "default", "value": "oui" }, - "services.test.files.mailname.name": { + "services.test_service.files.mailname.name": { "owner": "default", "value": "/etc/mailname" }, - "services.test.files.mailname.activate": { + "services.test_service.files.mailname.activate": { "owner": "default", "value": true }, - "services.test.files.mailname2.name": { + "services.test_service.files.mailname2.name": { "owner": "default", "value": "/etc/mailname2" }, - "services.test.files.mailname2.activate": { + "services.test_service.files.mailname2.activate": { "owner": "default", "value": true }, - "services.test.activate": { + "services.test_service.activate": { "owner": "default", "value": true }, - "services.test.manage": { + "services.test_service.manage": { "owner": "default", "value": true } diff --git a/tests/dictionaries/70container_filesmulti/makedict/base.json b/tests/dictionaries/70container_filesmulti/makedict/base.json index deaab82d..fe697574 100644 --- a/tests/dictionaries/70container_filesmulti/makedict/base.json +++ b/tests/dictionaries/70container_filesmulti/makedict/base.json @@ -1,9 +1,9 @@ { "rougail.general.mode_conteneur_actif": "oui", - "services.test.files.mailname.name": "/etc/mailname", - "services.test.files.mailname.activate": true, - "services.test.files.mailname2.name": "/etc/mailname2", - "services.test.files.mailname2.activate": true, - "services.test.activate": true, - "services.test.manage": true + "services.test_service.files.mailname.name": "/etc/mailname", + "services.test_service.files.mailname.activate": true, + "services.test_service.files.mailname2.name": "/etc/mailname2", + "services.test_service.files.mailname2.activate": true, + "services.test_service.activate": true, + "services.test_service.manage": true } diff --git a/tests/dictionaries/70container_filesmulti/makedict/before.json b/tests/dictionaries/70container_filesmulti/makedict/before.json index 24097e2e..3df6d974 100644 --- a/tests/dictionaries/70container_filesmulti/makedict/before.json +++ b/tests/dictionaries/70container_filesmulti/makedict/before.json @@ -3,27 +3,27 @@ "owner": "default", "value": "oui" }, - "services.test.files.mailname.name": { + "services.test_service.files.mailname.name": { "owner": "default", "value": "/etc/mailname" }, - "services.test.files.mailname.activate": { + "services.test_service.files.mailname.activate": { "owner": "default", "value": true }, - "services.test.files.mailname2.name": { + "services.test_service.files.mailname2.name": { "owner": "default", "value": "/etc/mailname2" }, - "services.test.files.mailname2.activate": { + "services.test_service.files.mailname2.activate": { "owner": "default", "value": true }, - "services.test.activate": { + "services.test_service.activate": { "owner": "default", "value": true }, - "services.test.manage": { + "services.test_service.manage": { "owner": "default", "value": true } diff --git a/tests/dictionaries/70container_filesmulti/tiramisu/base.py b/tests/dictionaries/70container_filesmulti/tiramisu/base.py index 3048d5c3..c740b96a 100644 --- a/tests/dictionaries/70container_filesmulti/tiramisu/base.py +++ b/tests/dictionaries/70container_filesmulti/tiramisu/base.py @@ -28,6 +28,6 @@ option_10.impl_set_information('source', "mailname2") option_6 = OptionDescription(name="files", doc="files", children=[option_7, option_10]) option_13 = BoolOption(name="activate", doc="activate", 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_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, option_4]) diff --git a/tests/dictionaries/70container_filesredefine/makedict/after.json b/tests/dictionaries/70container_filesredefine/makedict/after.json index 4c4c7f95..3666735a 100644 --- a/tests/dictionaries/70container_filesredefine/makedict/after.json +++ b/tests/dictionaries/70container_filesredefine/makedict/after.json @@ -3,19 +3,19 @@ "owner": "default", "value": "oui" }, - "services.test.files.mailname_new.name": { + "services.test_service.files.mailname_new.name": { "owner": "default", "value": "/etc/mailname" }, - "services.test.files.mailname_new.activate": { + "services.test_service.files.mailname_new.activate": { "owner": "default", "value": true }, - "services.test.activate": { + "services.test_service.activate": { "owner": "default", "value": true }, - "services.test.manage": { + "services.test_service.manage": { "owner": "default", "value": true } diff --git a/tests/dictionaries/70container_filesredefine/makedict/base.json b/tests/dictionaries/70container_filesredefine/makedict/base.json index c7451841..cbda8cb4 100644 --- a/tests/dictionaries/70container_filesredefine/makedict/base.json +++ b/tests/dictionaries/70container_filesredefine/makedict/base.json @@ -1,7 +1,7 @@ { "rougail.general.mode_conteneur_actif": "oui", - "services.test.files.mailname_new.name": "/etc/mailname", - "services.test.files.mailname_new.activate": true, - "services.test.activate": true, - "services.test.manage": true + "services.test_service.files.mailname_new.name": "/etc/mailname", + "services.test_service.files.mailname_new.activate": true, + "services.test_service.activate": true, + "services.test_service.manage": true } diff --git a/tests/dictionaries/70container_filesredefine/makedict/before.json b/tests/dictionaries/70container_filesredefine/makedict/before.json index 4c4c7f95..3666735a 100644 --- a/tests/dictionaries/70container_filesredefine/makedict/before.json +++ b/tests/dictionaries/70container_filesredefine/makedict/before.json @@ -3,19 +3,19 @@ "owner": "default", "value": "oui" }, - "services.test.files.mailname_new.name": { + "services.test_service.files.mailname_new.name": { "owner": "default", "value": "/etc/mailname" }, - "services.test.files.mailname_new.activate": { + "services.test_service.files.mailname_new.activate": { "owner": "default", "value": true }, - "services.test.activate": { + "services.test_service.activate": { "owner": "default", "value": true }, - "services.test.manage": { + "services.test_service.manage": { "owner": "default", "value": true } diff --git a/tests/dictionaries/70container_filesredefine/tiramisu/base.py b/tests/dictionaries/70container_filesredefine/tiramisu/base.py index 839329a2..76c880ba 100644 --- a/tests/dictionaries/70container_filesredefine/tiramisu/base.py +++ b/tests/dictionaries/70container_filesredefine/tiramisu/base.py @@ -24,6 +24,6 @@ option_7.impl_set_information('source', "mailname.new") option_6 = OptionDescription(name="files", doc="files", children=[option_7]) option_10 = BoolOption(name="activate", doc="activate", 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_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, option_4]) diff --git a/tests/dictionaries/70container_new/makedict/after.json b/tests/dictionaries/70container_new/makedict/after.json index 07fda6ef..9563ea8f 100644 --- a/tests/dictionaries/70container_new/makedict/after.json +++ b/tests/dictionaries/70container_new/makedict/after.json @@ -3,11 +3,11 @@ "owner": "default", "value": "oui" }, - "services.test.activate": { + "services.test_service.activate": { "owner": "default", "value": true }, - "services.test.manage": { + "services.test_service.manage": { "owner": "default", "value": true } diff --git a/tests/dictionaries/70container_new/makedict/base.json b/tests/dictionaries/70container_new/makedict/base.json index a9753778..18151a28 100644 --- a/tests/dictionaries/70container_new/makedict/base.json +++ b/tests/dictionaries/70container_new/makedict/base.json @@ -1,5 +1,5 @@ { "rougail.general.mode_conteneur_actif": "oui", - "services.test.activate": true, - "services.test.manage": true + "services.test_service.activate": true, + "services.test_service.manage": true } diff --git a/tests/dictionaries/70container_new/makedict/before.json b/tests/dictionaries/70container_new/makedict/before.json index 07fda6ef..9563ea8f 100644 --- a/tests/dictionaries/70container_new/makedict/before.json +++ b/tests/dictionaries/70container_new/makedict/before.json @@ -3,11 +3,11 @@ "owner": "default", "value": "oui" }, - "services.test.activate": { + "services.test_service.activate": { "owner": "default", "value": true }, - "services.test.manage": { + "services.test_service.manage": { "owner": "default", "value": true } diff --git a/tests/dictionaries/70container_new/tiramisu/base.py b/tests/dictionaries/70container_new/tiramisu/base.py index 2fadab38..4f2e6011 100644 --- a/tests/dictionaries/70container_new/tiramisu/base.py +++ b/tests/dictionaries/70container_new/tiramisu/base.py @@ -19,6 +19,6 @@ option_2 = OptionDescription(name="general", doc="général", children=[option_3 option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2]) option_6 = BoolOption(name="activate", doc="activate", default=True) option_7 = BoolOption(name="manage", doc="manage", default=True) -option_5 = OptionDescription(name="test", doc="test", children=[option_6, option_7]) +option_5 = OptionDescription(name="test_service", doc="test.service", children=[option_6, option_7]) 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]) diff --git a/tests/dictionaries/70container_newnocont/makedict/after.json b/tests/dictionaries/70container_newnocont/makedict/after.json index b7f1fd9e..6252cc15 100644 --- a/tests/dictionaries/70container_newnocont/makedict/after.json +++ b/tests/dictionaries/70container_newnocont/makedict/after.json @@ -3,11 +3,11 @@ "owner": "default", "value": "non" }, - "services.test.activate": { + "services.test_service.activate": { "owner": "default", "value": true }, - "services.test.manage": { + "services.test_service.manage": { "owner": "default", "value": true } diff --git a/tests/dictionaries/70container_newnocont/makedict/base.json b/tests/dictionaries/70container_newnocont/makedict/base.json index e38686ea..69cfb362 100644 --- a/tests/dictionaries/70container_newnocont/makedict/base.json +++ b/tests/dictionaries/70container_newnocont/makedict/base.json @@ -1,5 +1,5 @@ { "rougail.general.mode_conteneur_actif": "non", - "services.test.activate": true, - "services.test.manage": true + "services.test_service.activate": true, + "services.test_service.manage": true } diff --git a/tests/dictionaries/70container_newnocont/makedict/before.json b/tests/dictionaries/70container_newnocont/makedict/before.json index b7f1fd9e..6252cc15 100644 --- a/tests/dictionaries/70container_newnocont/makedict/before.json +++ b/tests/dictionaries/70container_newnocont/makedict/before.json @@ -3,11 +3,11 @@ "owner": "default", "value": "non" }, - "services.test.activate": { + "services.test_service.activate": { "owner": "default", "value": true }, - "services.test.manage": { + "services.test_service.manage": { "owner": "default", "value": true } diff --git a/tests/dictionaries/70container_newnocont/tiramisu/base.py b/tests/dictionaries/70container_newnocont/tiramisu/base.py index 984b64eb..7a77ccc4 100644 --- a/tests/dictionaries/70container_newnocont/tiramisu/base.py +++ b/tests/dictionaries/70container_newnocont/tiramisu/base.py @@ -19,6 +19,6 @@ option_2 = OptionDescription(name="general", doc="général", children=[option_3 option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2]) option_6 = BoolOption(name="activate", doc="activate", default=True) option_7 = BoolOption(name="manage", doc="manage", default=True) -option_5 = OptionDescription(name="test", doc="test", children=[option_6, option_7]) +option_5 = OptionDescription(name="test_service", doc="test.service", children=[option_6, option_7]) 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]) diff --git a/tests/dictionaries/70container_newwithip/makedict/after.json b/tests/dictionaries/70container_newwithip/makedict/after.json index cfa1cc50..fc73e6e5 100644 --- a/tests/dictionaries/70container_newwithip/makedict/after.json +++ b/tests/dictionaries/70container_newwithip/makedict/after.json @@ -7,11 +7,11 @@ "owner": "default", "value": null }, - "services.test.activate": { + "services.test_service.activate": { "owner": "default", "value": true }, - "services.test.manage": { + "services.test_service.manage": { "owner": "default", "value": true } diff --git a/tests/dictionaries/70container_newwithip/makedict/base.json b/tests/dictionaries/70container_newwithip/makedict/base.json index b8740113..fe91c390 100644 --- a/tests/dictionaries/70container_newwithip/makedict/base.json +++ b/tests/dictionaries/70container_newwithip/makedict/base.json @@ -1,6 +1,6 @@ { "rougail.general.mode_conteneur_actif": "oui", "rougail.general.adresse_ip_test": null, - "services.test.activate": true, - "services.test.manage": true + "services.test_service.activate": true, + "services.test_service.manage": true } diff --git a/tests/dictionaries/70container_newwithip/makedict/before.json b/tests/dictionaries/70container_newwithip/makedict/before.json index cfa1cc50..fc73e6e5 100644 --- a/tests/dictionaries/70container_newwithip/makedict/before.json +++ b/tests/dictionaries/70container_newwithip/makedict/before.json @@ -7,11 +7,11 @@ "owner": "default", "value": null }, - "services.test.activate": { + "services.test_service.activate": { "owner": "default", "value": true }, - "services.test.manage": { + "services.test_service.manage": { "owner": "default", "value": true } diff --git a/tests/dictionaries/70container_newwithip/tiramisu/base.py b/tests/dictionaries/70container_newwithip/tiramisu/base.py index a0180903..508d070b 100644 --- a/tests/dictionaries/70container_newwithip/tiramisu/base.py +++ b/tests/dictionaries/70container_newwithip/tiramisu/base.py @@ -20,6 +20,6 @@ option_2 = OptionDescription(name="general", doc="général", children=[option_3 option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2]) option_7 = BoolOption(name="activate", doc="activate", default=True) option_8 = BoolOption(name="manage", doc="manage", default=True) -option_6 = OptionDescription(name="test", doc="test", children=[option_7, option_8]) +option_6 = OptionDescription(name="test_service", doc="test.service", children=[option_7, option_8]) 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]) diff --git a/tests/dictionaries/70service_base/makedict/after.json b/tests/dictionaries/70service_base/makedict/after.json index c8847b43..ef29924c 100644 --- a/tests/dictionaries/70service_base/makedict/after.json +++ b/tests/dictionaries/70service_base/makedict/after.json @@ -3,11 +3,11 @@ "owner": "default", "value": "oui" }, - "services.testsrv.activate": { + "services.testsrv_service.activate": { "owner": "default", "value": true }, - "services.testsrv.manage": { + "services.testsrv_service.manage": { "owner": "default", "value": true } diff --git a/tests/dictionaries/70service_base/makedict/base.json b/tests/dictionaries/70service_base/makedict/base.json index d89ef3da..0ffb9968 100644 --- a/tests/dictionaries/70service_base/makedict/base.json +++ b/tests/dictionaries/70service_base/makedict/base.json @@ -1,5 +1,5 @@ { "rougail.general.mode_conteneur_actif": "oui", - "services.testsrv.activate": true, - "services.testsrv.manage": true + "services.testsrv_service.activate": true, + "services.testsrv_service.manage": true } diff --git a/tests/dictionaries/70service_base/makedict/before.json b/tests/dictionaries/70service_base/makedict/before.json index c8847b43..ef29924c 100644 --- a/tests/dictionaries/70service_base/makedict/before.json +++ b/tests/dictionaries/70service_base/makedict/before.json @@ -3,11 +3,11 @@ "owner": "default", "value": "oui" }, - "services.testsrv.activate": { + "services.testsrv_service.activate": { "owner": "default", "value": true }, - "services.testsrv.manage": { + "services.testsrv_service.manage": { "owner": "default", "value": true } diff --git a/tests/dictionaries/70service_base/tiramisu/base.py b/tests/dictionaries/70service_base/tiramisu/base.py index 410ca175..87dcedd2 100644 --- a/tests/dictionaries/70service_base/tiramisu/base.py +++ b/tests/dictionaries/70service_base/tiramisu/base.py @@ -19,6 +19,6 @@ option_2 = OptionDescription(name="general", doc="général", children=[option_3 option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2]) option_6 = BoolOption(name="activate", doc="activate", default=True) option_7 = BoolOption(name="manage", doc="manage", default=True) -option_5 = OptionDescription(name="testsrv", doc="testsrv", children=[option_6, option_7]) +option_5 = OptionDescription(name="testsrv_service", doc="testsrv.service", children=[option_6, option_7]) 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]) diff --git a/tests/dictionaries/70service_disabled/makedict/after.json b/tests/dictionaries/70service_disabled/makedict/after.json index 08915df9..c25d4da2 100644 --- a/tests/dictionaries/70service_disabled/makedict/after.json +++ b/tests/dictionaries/70service_disabled/makedict/after.json @@ -3,11 +3,11 @@ "owner": "default", "value": "no" }, - "services.test.activate": { + "services.test_service.activate": { "owner": "default", "value": false }, - "services.test.manage": { + "services.test_service.manage": { "owner": "default", "value": true } diff --git a/tests/dictionaries/70service_disabled/makedict/base.json b/tests/dictionaries/70service_disabled/makedict/base.json index 393b57d7..bfd1c0d9 100644 --- a/tests/dictionaries/70service_disabled/makedict/base.json +++ b/tests/dictionaries/70service_disabled/makedict/base.json @@ -1,5 +1,5 @@ { "rougail.condition": "no", - "services.test.activate": false, - "services.test.manage": true + "services.test_service.activate": false, + "services.test_service.manage": true } diff --git a/tests/dictionaries/70service_disabled/makedict/before.json b/tests/dictionaries/70service_disabled/makedict/before.json index 08915df9..c25d4da2 100644 --- a/tests/dictionaries/70service_disabled/makedict/before.json +++ b/tests/dictionaries/70service_disabled/makedict/before.json @@ -3,11 +3,11 @@ "owner": "default", "value": "no" }, - "services.test.activate": { + "services.test_service.activate": { "owner": "default", "value": false }, - "services.test.manage": { + "services.test_service.manage": { "owner": "default", "value": true } diff --git a/tests/dictionaries/70service_disabled/tiramisu/base.py b/tests/dictionaries/70service_disabled/tiramisu/base.py index 30eb14ae..520869a4 100644 --- a/tests/dictionaries/70service_disabled/tiramisu/base.py +++ b/tests/dictionaries/70service_disabled/tiramisu/base.py @@ -18,6 +18,6 @@ option_2 = StrOption(name="condition", doc="condition", default="no", properties option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2]) option_5 = BoolOption(name="activate", doc="activate", default=False) option_6 = BoolOption(name="manage", doc="manage", default=True) -option_4 = OptionDescription(name="test", doc="test", children=[option_5, option_6]) +option_4 = OptionDescription(name="test_service", doc="test.service", children=[option_5, option_6]) option_3 = OptionDescription(name="services", doc="services", children=[option_4], properties=frozenset({"hidden"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, option_3]) diff --git a/tests/dictionaries/70service_disabled_undisable/makedict/after.json b/tests/dictionaries/70service_disabled_undisable/makedict/after.json index 08915df9..c25d4da2 100644 --- a/tests/dictionaries/70service_disabled_undisable/makedict/after.json +++ b/tests/dictionaries/70service_disabled_undisable/makedict/after.json @@ -3,11 +3,11 @@ "owner": "default", "value": "no" }, - "services.test.activate": { + "services.test_service.activate": { "owner": "default", "value": false }, - "services.test.manage": { + "services.test_service.manage": { "owner": "default", "value": true } diff --git a/tests/dictionaries/70service_disabled_undisable/makedict/base.json b/tests/dictionaries/70service_disabled_undisable/makedict/base.json index 393b57d7..bfd1c0d9 100644 --- a/tests/dictionaries/70service_disabled_undisable/makedict/base.json +++ b/tests/dictionaries/70service_disabled_undisable/makedict/base.json @@ -1,5 +1,5 @@ { "rougail.condition": "no", - "services.test.activate": false, - "services.test.manage": true + "services.test_service.activate": false, + "services.test_service.manage": true } diff --git a/tests/dictionaries/70service_disabled_undisable/makedict/before.json b/tests/dictionaries/70service_disabled_undisable/makedict/before.json index 08915df9..c25d4da2 100644 --- a/tests/dictionaries/70service_disabled_undisable/makedict/before.json +++ b/tests/dictionaries/70service_disabled_undisable/makedict/before.json @@ -3,11 +3,11 @@ "owner": "default", "value": "no" }, - "services.test.activate": { + "services.test_service.activate": { "owner": "default", "value": false }, - "services.test.manage": { + "services.test_service.manage": { "owner": "default", "value": true } diff --git a/tests/dictionaries/70service_disabled_undisable/tiramisu/base.py b/tests/dictionaries/70service_disabled_undisable/tiramisu/base.py index 8c7565e4..ae9db51f 100644 --- a/tests/dictionaries/70service_disabled_undisable/tiramisu/base.py +++ b/tests/dictionaries/70service_disabled_undisable/tiramisu/base.py @@ -18,7 +18,7 @@ option_2 = StrOption(name="condition", doc="condition", default="no", properties option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2]) option_5 = BoolOption(name="activate", doc="activate", default=False) option_6 = BoolOption(name="manage", doc="manage", default=True) -option_4 = OptionDescription(name="test", doc="test", children=[option_5, option_6]) +option_4 = OptionDescription(name="test_service", doc="test.service", children=[option_5, option_6]) option_4.impl_set_information('undisable', True) option_3 = OptionDescription(name="services", doc="services", children=[option_4], properties=frozenset({"hidden"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, option_3]) diff --git a/tests/dictionaries/70service_engine/makedict/after.json b/tests/dictionaries/70service_engine/makedict/after.json index c8847b43..ef29924c 100644 --- a/tests/dictionaries/70service_engine/makedict/after.json +++ b/tests/dictionaries/70service_engine/makedict/after.json @@ -3,11 +3,11 @@ "owner": "default", "value": "oui" }, - "services.testsrv.activate": { + "services.testsrv_service.activate": { "owner": "default", "value": true }, - "services.testsrv.manage": { + "services.testsrv_service.manage": { "owner": "default", "value": true } diff --git a/tests/dictionaries/70service_engine/makedict/base.json b/tests/dictionaries/70service_engine/makedict/base.json index d89ef3da..0ffb9968 100644 --- a/tests/dictionaries/70service_engine/makedict/base.json +++ b/tests/dictionaries/70service_engine/makedict/base.json @@ -1,5 +1,5 @@ { "rougail.general.mode_conteneur_actif": "oui", - "services.testsrv.activate": true, - "services.testsrv.manage": true + "services.testsrv_service.activate": true, + "services.testsrv_service.manage": true } diff --git a/tests/dictionaries/70service_engine/makedict/before.json b/tests/dictionaries/70service_engine/makedict/before.json index c8847b43..ef29924c 100644 --- a/tests/dictionaries/70service_engine/makedict/before.json +++ b/tests/dictionaries/70service_engine/makedict/before.json @@ -3,11 +3,11 @@ "owner": "default", "value": "oui" }, - "services.testsrv.activate": { + "services.testsrv_service.activate": { "owner": "default", "value": true }, - "services.testsrv.manage": { + "services.testsrv_service.manage": { "owner": "default", "value": true } diff --git a/tests/dictionaries/70service_engine/tiramisu/base.py b/tests/dictionaries/70service_engine/tiramisu/base.py index c6f1d0a5..a3bf3ad7 100644 --- a/tests/dictionaries/70service_engine/tiramisu/base.py +++ b/tests/dictionaries/70service_engine/tiramisu/base.py @@ -19,7 +19,7 @@ option_2 = OptionDescription(name="general", doc="général", children=[option_3 option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2]) option_6 = BoolOption(name="activate", doc="activate", default=True) option_7 = BoolOption(name="manage", doc="manage", default=True) -option_5 = OptionDescription(name="testsrv", doc="testsrv", children=[option_6, option_7]) +option_5 = OptionDescription(name="testsrv_service", doc="testsrv.service", children=[option_6, option_7]) option_5.impl_set_information('engine', "creole") 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]) diff --git a/tests/dictionaries/70service_engine_dash/makedict/after.json b/tests/dictionaries/70service_engine_dash/makedict/after.json index a448d1b4..c694a952 100644 --- a/tests/dictionaries/70service_engine_dash/makedict/after.json +++ b/tests/dictionaries/70service_engine_dash/makedict/after.json @@ -3,11 +3,11 @@ "owner": "default", "value": "oui" }, - "services.test_srv.activate": { + "services.test_srv_service.activate": { "owner": "default", "value": true }, - "services.test_srv.manage": { + "services.test_srv_service.manage": { "owner": "default", "value": true } diff --git a/tests/dictionaries/70service_engine_dash/makedict/base.json b/tests/dictionaries/70service_engine_dash/makedict/base.json index f86cf2f8..3d2f900e 100644 --- a/tests/dictionaries/70service_engine_dash/makedict/base.json +++ b/tests/dictionaries/70service_engine_dash/makedict/base.json @@ -1,5 +1,5 @@ { "rougail.general.mode_conteneur_actif": "oui", - "services.test_srv.activate": true, - "services.test_srv.manage": true + "services.test_srv_service.activate": true, + "services.test_srv_service.manage": true } diff --git a/tests/dictionaries/70service_engine_dash/makedict/before.json b/tests/dictionaries/70service_engine_dash/makedict/before.json index a448d1b4..c694a952 100644 --- a/tests/dictionaries/70service_engine_dash/makedict/before.json +++ b/tests/dictionaries/70service_engine_dash/makedict/before.json @@ -3,11 +3,11 @@ "owner": "default", "value": "oui" }, - "services.test_srv.activate": { + "services.test_srv_service.activate": { "owner": "default", "value": true }, - "services.test_srv.manage": { + "services.test_srv_service.manage": { "owner": "default", "value": true } diff --git a/tests/dictionaries/70service_engine_dash/tiramisu/base.py b/tests/dictionaries/70service_engine_dash/tiramisu/base.py index a627524a..54059825 100644 --- a/tests/dictionaries/70service_engine_dash/tiramisu/base.py +++ b/tests/dictionaries/70service_engine_dash/tiramisu/base.py @@ -19,7 +19,7 @@ option_2 = OptionDescription(name="general", doc="général", children=[option_3 option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2]) option_6 = BoolOption(name="activate", doc="activate", default=True) option_7 = BoolOption(name="manage", doc="manage", default=True) -option_5 = OptionDescription(name="test_srv", doc="test-srv", children=[option_6, option_7]) +option_5 = OptionDescription(name="test_srv_service", doc="test-srv.service", children=[option_6, option_7]) option_5.impl_set_information('engine', "creole") 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]) diff --git a/tests/dictionaries/70service_mount/makedict/after.json b/tests/dictionaries/70service_mount/makedict/after.json index c8847b43..4f436da8 100644 --- a/tests/dictionaries/70service_mount/makedict/after.json +++ b/tests/dictionaries/70service_mount/makedict/after.json @@ -3,11 +3,11 @@ "owner": "default", "value": "oui" }, - "services.testsrv.activate": { + "services.testsrv_mount.activate": { "owner": "default", "value": true }, - "services.testsrv.manage": { + "services.testsrv_mount.manage": { "owner": "default", "value": true } diff --git a/tests/dictionaries/70service_mount/makedict/base.json b/tests/dictionaries/70service_mount/makedict/base.json index d89ef3da..7b5722ed 100644 --- a/tests/dictionaries/70service_mount/makedict/base.json +++ b/tests/dictionaries/70service_mount/makedict/base.json @@ -1,5 +1,5 @@ { "rougail.general.mode_conteneur_actif": "oui", - "services.testsrv.activate": true, - "services.testsrv.manage": true + "services.testsrv_mount.activate": true, + "services.testsrv_mount.manage": true } diff --git a/tests/dictionaries/70service_mount/makedict/before.json b/tests/dictionaries/70service_mount/makedict/before.json index c8847b43..4f436da8 100644 --- a/tests/dictionaries/70service_mount/makedict/before.json +++ b/tests/dictionaries/70service_mount/makedict/before.json @@ -3,11 +3,11 @@ "owner": "default", "value": "oui" }, - "services.testsrv.activate": { + "services.testsrv_mount.activate": { "owner": "default", "value": true }, - "services.testsrv.manage": { + "services.testsrv_mount.manage": { "owner": "default", "value": true } diff --git a/tests/dictionaries/70service_mount/tiramisu/base.py b/tests/dictionaries/70service_mount/tiramisu/base.py index fcd3bdd3..a5378359 100644 --- a/tests/dictionaries/70service_mount/tiramisu/base.py +++ b/tests/dictionaries/70service_mount/tiramisu/base.py @@ -19,7 +19,7 @@ option_2 = OptionDescription(name="general", doc="général", children=[option_3 option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2]) option_6 = BoolOption(name="activate", doc="activate", default=True) option_7 = BoolOption(name="manage", doc="manage", default=True) -option_5 = OptionDescription(name="testsrv", doc="testsrv", children=[option_6, option_7]) +option_5 = OptionDescription(name="testsrv_mount", doc="testsrv.mount", children=[option_6, option_7]) option_5.impl_set_information('type', "mount") option_5.impl_set_information('engine', "creole") option_4 = OptionDescription(name="services", doc="services", children=[option_5], properties=frozenset({"hidden"})) diff --git a/tests/dictionaries/70service_not_managed/makedict/after.json b/tests/dictionaries/70service_not_managed/makedict/after.json index 8b3606f3..e63560ee 100644 --- a/tests/dictionaries/70service_not_managed/makedict/after.json +++ b/tests/dictionaries/70service_not_managed/makedict/after.json @@ -3,19 +3,19 @@ "owner": "default", "value": "mailname" }, - "services.test.files.test.name": { + "services.test_service.files.test.name": { "owner": "default", "value": "/tmp/test" }, - "services.test.files.test.activate": { + "services.test_service.files.test.activate": { "owner": "default", "value": true }, - "services.test.activate": { + "services.test_service.activate": { "owner": "default", "value": true }, - "services.test.manage": { + "services.test_service.manage": { "owner": "default", "value": false } diff --git a/tests/dictionaries/70service_not_managed/makedict/base.json b/tests/dictionaries/70service_not_managed/makedict/base.json index 60918376..efdb81db 100644 --- a/tests/dictionaries/70service_not_managed/makedict/base.json +++ b/tests/dictionaries/70service_not_managed/makedict/base.json @@ -1,7 +1,7 @@ { "rougail.var": "mailname", - "services.test.files.test.name": "/tmp/test", - "services.test.files.test.activate": true, - "services.test.activate": true, - "services.test.manage": false + "services.test_service.files.test.name": "/tmp/test", + "services.test_service.files.test.activate": true, + "services.test_service.activate": true, + "services.test_service.manage": false } diff --git a/tests/dictionaries/70service_not_managed/makedict/before.json b/tests/dictionaries/70service_not_managed/makedict/before.json index 8b3606f3..e63560ee 100644 --- a/tests/dictionaries/70service_not_managed/makedict/before.json +++ b/tests/dictionaries/70service_not_managed/makedict/before.json @@ -3,19 +3,19 @@ "owner": "default", "value": "mailname" }, - "services.test.files.test.name": { + "services.test_service.files.test.name": { "owner": "default", "value": "/tmp/test" }, - "services.test.files.test.activate": { + "services.test_service.files.test.activate": { "owner": "default", "value": true }, - "services.test.activate": { + "services.test_service.activate": { "owner": "default", "value": true }, - "services.test.manage": { + "services.test_service.manage": { "owner": "default", "value": false } diff --git a/tests/dictionaries/70service_not_managed/tiramisu/base.py b/tests/dictionaries/70service_not_managed/tiramisu/base.py index ab514e41..06e16cf6 100644 --- a/tests/dictionaries/70service_not_managed/tiramisu/base.py +++ b/tests/dictionaries/70service_not_managed/tiramisu/base.py @@ -23,6 +23,6 @@ option_6.impl_set_information('source', "test") option_5 = OptionDescription(name="files", doc="files", children=[option_6]) option_9 = BoolOption(name="activate", doc="activate", default=True) option_10 = BoolOption(name="manage", doc="manage", default=False) -option_4 = OptionDescription(name="test", doc="test", children=[option_5, option_9, option_10]) +option_4 = OptionDescription(name="test_service", doc="test.service", children=[option_5, option_9, option_10]) option_3 = OptionDescription(name="services", doc="services", children=[option_4], properties=frozenset({"hidden"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, option_3]) diff --git a/tests/dictionaries/70service_servicelist/makedict/after.json b/tests/dictionaries/70service_servicelist/makedict/after.json index 70056b4a..761b7349 100644 --- a/tests/dictionaries/70service_servicelist/makedict/after.json +++ b/tests/dictionaries/70service_servicelist/makedict/after.json @@ -3,11 +3,11 @@ "owner": "default", "value": "no" }, - "services.test.activate": { + "services.test_service.activate": { "owner": "default", "value": true }, - "services.test.manage": { + "services.test_service.manage": { "owner": "default", "value": true } diff --git a/tests/dictionaries/70service_servicelist/makedict/base.json b/tests/dictionaries/70service_servicelist/makedict/base.json index 939e54eb..a27d2712 100644 --- a/tests/dictionaries/70service_servicelist/makedict/base.json +++ b/tests/dictionaries/70service_servicelist/makedict/base.json @@ -1,5 +1,5 @@ { "rougail.condition": "no", - "services.test.activate": true, - "services.test.manage": true + "services.test_service.activate": true, + "services.test_service.manage": true } diff --git a/tests/dictionaries/70service_servicelist/makedict/before.json b/tests/dictionaries/70service_servicelist/makedict/before.json index 70056b4a..761b7349 100644 --- a/tests/dictionaries/70service_servicelist/makedict/before.json +++ b/tests/dictionaries/70service_servicelist/makedict/before.json @@ -3,11 +3,11 @@ "owner": "default", "value": "no" }, - "services.test.activate": { + "services.test_service.activate": { "owner": "default", "value": true }, - "services.test.manage": { + "services.test_service.manage": { "owner": "default", "value": true } diff --git a/tests/dictionaries/70service_servicelist/tiramisu/base.py b/tests/dictionaries/70service_servicelist/tiramisu/base.py index 4ce880a6..5f5924e9 100644 --- a/tests/dictionaries/70service_servicelist/tiramisu/base.py +++ b/tests/dictionaries/70service_servicelist/tiramisu/base.py @@ -18,6 +18,6 @@ option_2 = StrOption(name="condition", doc="condition", default="no", properties option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2]) option_5 = BoolOption(name="activate", doc="activate", default=Calculation(func.calc_value, Params((ParamValue(False)), kwargs={'default': ParamValue(True), 'condition_0': ParamOption(option_2, notraisepropertyerror=True), 'expected_0': ParamValue("yes")}))) option_6 = BoolOption(name="manage", doc="manage", default=True) -option_4 = OptionDescription(name="test", doc="test", children=[option_5, option_6]) +option_4 = OptionDescription(name="test_service", doc="test.service", children=[option_5, option_6]) option_3 = OptionDescription(name="services", doc="services", children=[option_4], properties=frozenset({"hidden"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, option_3]) diff --git a/tests/dictionaries/70service_servicelist_disabled_if_in/makedict/after.json b/tests/dictionaries/70service_servicelist_disabled_if_in/makedict/after.json index 2eba5258..ba51aab9 100644 --- a/tests/dictionaries/70service_servicelist_disabled_if_in/makedict/after.json +++ b/tests/dictionaries/70service_servicelist_disabled_if_in/makedict/after.json @@ -3,11 +3,11 @@ "owner": "default", "value": "no" }, - "services.test.activate": { + "services.test_service.activate": { "owner": "default", "value": false }, - "services.test.manage": { + "services.test_service.manage": { "owner": "default", "value": true } diff --git a/tests/dictionaries/70service_servicelist_disabled_if_in/makedict/base.json b/tests/dictionaries/70service_servicelist_disabled_if_in/makedict/base.json index e97d9ea7..8626d178 100644 --- a/tests/dictionaries/70service_servicelist_disabled_if_in/makedict/base.json +++ b/tests/dictionaries/70service_servicelist_disabled_if_in/makedict/base.json @@ -1,5 +1,5 @@ { "rougail.condition1": "no", - "services.test.activate": false, - "services.test.manage": true + "services.test_service.activate": false, + "services.test_service.manage": true } diff --git a/tests/dictionaries/70service_servicelist_disabled_if_in/makedict/before.json b/tests/dictionaries/70service_servicelist_disabled_if_in/makedict/before.json index 2eba5258..ba51aab9 100644 --- a/tests/dictionaries/70service_servicelist_disabled_if_in/makedict/before.json +++ b/tests/dictionaries/70service_servicelist_disabled_if_in/makedict/before.json @@ -3,11 +3,11 @@ "owner": "default", "value": "no" }, - "services.test.activate": { + "services.test_service.activate": { "owner": "default", "value": false }, - "services.test.manage": { + "services.test_service.manage": { "owner": "default", "value": true } diff --git a/tests/dictionaries/70service_servicelist_disabled_if_in/tiramisu/base.py b/tests/dictionaries/70service_servicelist_disabled_if_in/tiramisu/base.py index 8467a6b5..29ebcf8d 100644 --- a/tests/dictionaries/70service_servicelist_disabled_if_in/tiramisu/base.py +++ b/tests/dictionaries/70service_servicelist_disabled_if_in/tiramisu/base.py @@ -19,6 +19,6 @@ option_3 = StrOption(name="condition2", doc="condition2", default="no", properti option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2, option_3]) option_6 = BoolOption(name="activate", doc="activate", default=Calculation(func.calc_value, Params((ParamValue(False)), kwargs={'default': ParamValue(True), 'condition_0': ParamOption(option_3, notraisepropertyerror=True), 'expected_0': ParamValue("yes")}))) option_7 = BoolOption(name="manage", doc="manage", default=True) -option_5 = OptionDescription(name="test", doc="test", children=[option_6, option_7]) +option_5 = OptionDescription(name="test_service", doc="test.service", children=[option_6, option_7]) 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]) diff --git a/tests/dictionaries/70service_servicelist_extra/makedict/after.json b/tests/dictionaries/70service_servicelist_extra/makedict/after.json index 2e714b70..1d412c35 100644 --- a/tests/dictionaries/70service_servicelist_extra/makedict/after.json +++ b/tests/dictionaries/70service_servicelist_extra/makedict/after.json @@ -3,11 +3,11 @@ "owner": "default", "value": "no" }, - "services.test.activate": { + "services.test_service.activate": { "owner": "default", "value": true }, - "services.test.manage": { + "services.test_service.manage": { "owner": "default", "value": true } diff --git a/tests/dictionaries/70service_servicelist_extra/makedict/base.json b/tests/dictionaries/70service_servicelist_extra/makedict/base.json index d0a40a85..74c80f4a 100644 --- a/tests/dictionaries/70service_servicelist_extra/makedict/base.json +++ b/tests/dictionaries/70service_servicelist_extra/makedict/base.json @@ -1,5 +1,5 @@ { "extra.condition": "no", - "services.test.activate": true, - "services.test.manage": true + "services.test_service.activate": true, + "services.test_service.manage": true } diff --git a/tests/dictionaries/70service_servicelist_extra/makedict/before.json b/tests/dictionaries/70service_servicelist_extra/makedict/before.json index 2e714b70..1d412c35 100644 --- a/tests/dictionaries/70service_servicelist_extra/makedict/before.json +++ b/tests/dictionaries/70service_servicelist_extra/makedict/before.json @@ -3,11 +3,11 @@ "owner": "default", "value": "no" }, - "services.test.activate": { + "services.test_service.activate": { "owner": "default", "value": true }, - "services.test.manage": { + "services.test_service.manage": { "owner": "default", "value": true } diff --git a/tests/dictionaries/70service_servicelist_extra/tiramisu/base.py b/tests/dictionaries/70service_servicelist_extra/tiramisu/base.py index bd8adf55..13dba699 100644 --- a/tests/dictionaries/70service_servicelist_extra/tiramisu/base.py +++ b/tests/dictionaries/70service_servicelist_extra/tiramisu/base.py @@ -18,6 +18,6 @@ option_2 = StrOption(name="condition", doc="condition", default="no", properties option_1 = OptionDescription(name="extra", doc="extra", children=[option_2]) option_5 = BoolOption(name="activate", doc="activate", default=Calculation(func.calc_value, Params((ParamValue(False)), kwargs={'default': ParamValue(True), 'condition_0': ParamOption(option_2, notraisepropertyerror=True), 'expected_0': ParamValue("yes")}))) option_6 = BoolOption(name="manage", doc="manage", default=True) -option_4 = OptionDescription(name="test", doc="test", children=[option_5, option_6]) +option_4 = OptionDescription(name="test_service", doc="test.service", children=[option_5, option_6]) option_3 = OptionDescription(name="services", doc="services", children=[option_4], properties=frozenset({"hidden"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, option_3]) diff --git a/tests/dictionaries/70service_servicelist_file/makedict/after.json b/tests/dictionaries/70service_servicelist_file/makedict/after.json index 7fc9693a..8c432fa1 100644 --- a/tests/dictionaries/70service_servicelist_file/makedict/after.json +++ b/tests/dictionaries/70service_servicelist_file/makedict/after.json @@ -7,19 +7,19 @@ "owner": "default", "value": "192.168.0.1" }, - "services.test.files.file.name": { + "services.test_service.files.file.name": { "owner": "default", "value": "/etc/file" }, - "services.test.files.file.activate": { + "services.test_service.files.file.activate": { "owner": "default", "value": true }, - "services.test.activate": { + "services.test_service.activate": { "owner": "default", "value": false }, - "services.test.manage": { + "services.test_service.manage": { "owner": "default", "value": true } diff --git a/tests/dictionaries/70service_servicelist_file/makedict/base.json b/tests/dictionaries/70service_servicelist_file/makedict/base.json index 8b3252bf..dc6816b9 100644 --- a/tests/dictionaries/70service_servicelist_file/makedict/base.json +++ b/tests/dictionaries/70service_servicelist_file/makedict/base.json @@ -1,8 +1,8 @@ { "rougail.condition": "no", "rougail.nut_monitor_host": "192.168.0.1", - "services.test.files.file.name": "/etc/file", - "services.test.files.file.activate": true, - "services.test.activate": false, - "services.test.manage": true + "services.test_service.files.file.name": "/etc/file", + "services.test_service.files.file.activate": true, + "services.test_service.activate": false, + "services.test_service.manage": true } diff --git a/tests/dictionaries/70service_servicelist_file/makedict/before.json b/tests/dictionaries/70service_servicelist_file/makedict/before.json index 7fc9693a..8c432fa1 100644 --- a/tests/dictionaries/70service_servicelist_file/makedict/before.json +++ b/tests/dictionaries/70service_servicelist_file/makedict/before.json @@ -7,19 +7,19 @@ "owner": "default", "value": "192.168.0.1" }, - "services.test.files.file.name": { + "services.test_service.files.file.name": { "owner": "default", "value": "/etc/file" }, - "services.test.files.file.activate": { + "services.test_service.files.file.activate": { "owner": "default", "value": true }, - "services.test.activate": { + "services.test_service.activate": { "owner": "default", "value": false }, - "services.test.manage": { + "services.test_service.manage": { "owner": "default", "value": true } diff --git a/tests/dictionaries/70service_servicelist_file/tiramisu/base.py b/tests/dictionaries/70service_servicelist_file/tiramisu/base.py index dafc1d55..92cc8153 100644 --- a/tests/dictionaries/70service_servicelist_file/tiramisu/base.py +++ b/tests/dictionaries/70service_servicelist_file/tiramisu/base.py @@ -24,6 +24,6 @@ option_7.impl_set_information('source', "file") option_6 = OptionDescription(name="files", doc="files", children=[option_7]) option_10 = BoolOption(name="activate", doc="activate", default=Calculation(func.calc_value, Params((ParamValue(False)), kwargs={'default': ParamValue(True), 'condition_0': ParamOption(option_2, notraisepropertyerror=True), 'expected_0': ParamValue("no")}))) 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_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, option_4]) diff --git a/tests/dictionaries/70service_servicelist_ip/makedict/after.json b/tests/dictionaries/70service_servicelist_ip/makedict/after.json index 73263cb6..4edde0b7 100644 --- a/tests/dictionaries/70service_servicelist_ip/makedict/after.json +++ b/tests/dictionaries/70service_servicelist_ip/makedict/after.json @@ -7,19 +7,19 @@ "owner": "default", "value": "192.168.0.1" }, - "services.test.ip.nut_monitor_host.name": { + "services.test_service.ip.nut_monitor_host.name": { "owner": "default", "value": "192.168.0.1" }, - "services.test.ip.nut_monitor_host.activate": { + "services.test_service.ip.nut_monitor_host.activate": { "owner": "default", "value": true }, - "services.test.activate": { + "services.test_service.activate": { "owner": "default", "value": false }, - "services.test.manage": { + "services.test_service.manage": { "owner": "default", "value": true } diff --git a/tests/dictionaries/70service_servicelist_ip/makedict/base.json b/tests/dictionaries/70service_servicelist_ip/makedict/base.json index 07338b83..de499690 100644 --- a/tests/dictionaries/70service_servicelist_ip/makedict/base.json +++ b/tests/dictionaries/70service_servicelist_ip/makedict/base.json @@ -1,8 +1,8 @@ { "rougail.condition": "no", "rougail.nut_monitor_host": "192.168.0.1", - "services.test.ip.nut_monitor_host.name": "192.168.0.1", - "services.test.ip.nut_monitor_host.activate": true, - "services.test.activate": false, - "services.test.manage": true + "services.test_service.ip.nut_monitor_host.name": "192.168.0.1", + "services.test_service.ip.nut_monitor_host.activate": true, + "services.test_service.activate": false, + "services.test_service.manage": true } diff --git a/tests/dictionaries/70service_servicelist_ip/makedict/before.json b/tests/dictionaries/70service_servicelist_ip/makedict/before.json index 73263cb6..4edde0b7 100644 --- a/tests/dictionaries/70service_servicelist_ip/makedict/before.json +++ b/tests/dictionaries/70service_servicelist_ip/makedict/before.json @@ -7,19 +7,19 @@ "owner": "default", "value": "192.168.0.1" }, - "services.test.ip.nut_monitor_host.name": { + "services.test_service.ip.nut_monitor_host.name": { "owner": "default", "value": "192.168.0.1" }, - "services.test.ip.nut_monitor_host.activate": { + "services.test_service.ip.nut_monitor_host.activate": { "owner": "default", "value": true }, - "services.test.activate": { + "services.test_service.activate": { "owner": "default", "value": false }, - "services.test.manage": { + "services.test_service.manage": { "owner": "default", "value": true } diff --git a/tests/dictionaries/70service_servicelist_ip/tiramisu/base.py b/tests/dictionaries/70service_servicelist_ip/tiramisu/base.py index d5add26e..aa28213c 100644 --- a/tests/dictionaries/70service_servicelist_ip/tiramisu/base.py +++ b/tests/dictionaries/70service_servicelist_ip/tiramisu/base.py @@ -23,6 +23,6 @@ option_7 = OptionDescription(name="nut_monitor_host", doc="nut_monitor_host", ch option_6 = OptionDescription(name="ip", doc="ip", children=[option_7]) option_10 = BoolOption(name="activate", doc="activate", default=Calculation(func.calc_value, Params((ParamValue(False)), kwargs={'default': ParamValue(True), 'condition_0': ParamOption(option_2, notraisepropertyerror=True), 'expected_0': ParamValue("no")}))) 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_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, option_4]) diff --git a/tests/dictionaries/70service_servicelist_not_managed/makedict/after.json b/tests/dictionaries/70service_servicelist_not_managed/makedict/after.json index 983c1185..72627c71 100644 --- a/tests/dictionaries/70service_servicelist_not_managed/makedict/after.json +++ b/tests/dictionaries/70service_servicelist_not_managed/makedict/after.json @@ -3,11 +3,11 @@ "owner": "default", "value": "no" }, - "services.test.activate": { + "services.test_service.activate": { "owner": "default", "value": true }, - "services.test.manage": { + "services.test_service.manage": { "owner": "default", "value": false } diff --git a/tests/dictionaries/70service_servicelist_not_managed/makedict/base.json b/tests/dictionaries/70service_servicelist_not_managed/makedict/base.json index 14db4b00..3be6c02d 100644 --- a/tests/dictionaries/70service_servicelist_not_managed/makedict/base.json +++ b/tests/dictionaries/70service_servicelist_not_managed/makedict/base.json @@ -1,5 +1,5 @@ { "rougail.condition": "no", - "services.test.activate": true, - "services.test.manage": false + "services.test_service.activate": true, + "services.test_service.manage": false } diff --git a/tests/dictionaries/70service_servicelist_not_managed/makedict/before.json b/tests/dictionaries/70service_servicelist_not_managed/makedict/before.json index 983c1185..72627c71 100644 --- a/tests/dictionaries/70service_servicelist_not_managed/makedict/before.json +++ b/tests/dictionaries/70service_servicelist_not_managed/makedict/before.json @@ -3,11 +3,11 @@ "owner": "default", "value": "no" }, - "services.test.activate": { + "services.test_service.activate": { "owner": "default", "value": true }, - "services.test.manage": { + "services.test_service.manage": { "owner": "default", "value": false } diff --git a/tests/dictionaries/70service_servicelist_not_managed/tiramisu/base.py b/tests/dictionaries/70service_servicelist_not_managed/tiramisu/base.py index 041221c0..ccbb972d 100644 --- a/tests/dictionaries/70service_servicelist_not_managed/tiramisu/base.py +++ b/tests/dictionaries/70service_servicelist_not_managed/tiramisu/base.py @@ -18,6 +18,6 @@ option_2 = StrOption(name="condition", doc="condition", default="no", properties option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2]) option_5 = BoolOption(name="activate", doc="activate", default=Calculation(func.calc_value, Params((ParamValue(False)), kwargs={'default': ParamValue(True), 'condition_0': ParamOption(option_2, notraisepropertyerror=True), 'expected_0': ParamValue("yes")}))) option_6 = BoolOption(name="manage", doc="manage", default=False) -option_4 = OptionDescription(name="test", doc="test", children=[option_5, option_6]) +option_4 = OptionDescription(name="test_service", doc="test.service", children=[option_5, option_6]) option_3 = OptionDescription(name="services", doc="services", children=[option_4], properties=frozenset({"hidden"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, option_3]) diff --git a/tests/dictionaries/70service_target/makedict/after.json b/tests/dictionaries/70service_target/makedict/after.json index c8847b43..ef29924c 100644 --- a/tests/dictionaries/70service_target/makedict/after.json +++ b/tests/dictionaries/70service_target/makedict/after.json @@ -3,11 +3,11 @@ "owner": "default", "value": "oui" }, - "services.testsrv.activate": { + "services.testsrv_service.activate": { "owner": "default", "value": true }, - "services.testsrv.manage": { + "services.testsrv_service.manage": { "owner": "default", "value": true } diff --git a/tests/dictionaries/70service_target/makedict/base.json b/tests/dictionaries/70service_target/makedict/base.json index d89ef3da..0ffb9968 100644 --- a/tests/dictionaries/70service_target/makedict/base.json +++ b/tests/dictionaries/70service_target/makedict/base.json @@ -1,5 +1,5 @@ { "rougail.general.mode_conteneur_actif": "oui", - "services.testsrv.activate": true, - "services.testsrv.manage": true + "services.testsrv_service.activate": true, + "services.testsrv_service.manage": true } diff --git a/tests/dictionaries/70service_target/makedict/before.json b/tests/dictionaries/70service_target/makedict/before.json index c8847b43..ef29924c 100644 --- a/tests/dictionaries/70service_target/makedict/before.json +++ b/tests/dictionaries/70service_target/makedict/before.json @@ -3,11 +3,11 @@ "owner": "default", "value": "oui" }, - "services.testsrv.activate": { + "services.testsrv_service.activate": { "owner": "default", "value": true }, - "services.testsrv.manage": { + "services.testsrv_service.manage": { "owner": "default", "value": true } diff --git a/tests/dictionaries/70service_target/tiramisu/base.py b/tests/dictionaries/70service_target/tiramisu/base.py index d4a1620d..fd88b26d 100644 --- a/tests/dictionaries/70service_target/tiramisu/base.py +++ b/tests/dictionaries/70service_target/tiramisu/base.py @@ -19,7 +19,7 @@ option_2 = OptionDescription(name="general", doc="général", children=[option_3 option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2]) option_6 = BoolOption(name="activate", doc="activate", default=True) option_7 = BoolOption(name="manage", doc="manage", default=True) -option_5 = OptionDescription(name="testsrv", doc="testsrv", children=[option_6, option_7]) +option_5 = OptionDescription(name="testsrv_service", doc="testsrv.service", children=[option_6, option_7]) option_5.impl_set_information('target', "test") 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]) diff --git a/tests/dictionaries/70service_target_engine/makedict/after.json b/tests/dictionaries/70service_target_engine/makedict/after.json index c8847b43..ef29924c 100644 --- a/tests/dictionaries/70service_target_engine/makedict/after.json +++ b/tests/dictionaries/70service_target_engine/makedict/after.json @@ -3,11 +3,11 @@ "owner": "default", "value": "oui" }, - "services.testsrv.activate": { + "services.testsrv_service.activate": { "owner": "default", "value": true }, - "services.testsrv.manage": { + "services.testsrv_service.manage": { "owner": "default", "value": true } diff --git a/tests/dictionaries/70service_target_engine/makedict/base.json b/tests/dictionaries/70service_target_engine/makedict/base.json index d89ef3da..0ffb9968 100644 --- a/tests/dictionaries/70service_target_engine/makedict/base.json +++ b/tests/dictionaries/70service_target_engine/makedict/base.json @@ -1,5 +1,5 @@ { "rougail.general.mode_conteneur_actif": "oui", - "services.testsrv.activate": true, - "services.testsrv.manage": true + "services.testsrv_service.activate": true, + "services.testsrv_service.manage": true } diff --git a/tests/dictionaries/70service_target_engine/makedict/before.json b/tests/dictionaries/70service_target_engine/makedict/before.json index c8847b43..ef29924c 100644 --- a/tests/dictionaries/70service_target_engine/makedict/before.json +++ b/tests/dictionaries/70service_target_engine/makedict/before.json @@ -3,11 +3,11 @@ "owner": "default", "value": "oui" }, - "services.testsrv.activate": { + "services.testsrv_service.activate": { "owner": "default", "value": true }, - "services.testsrv.manage": { + "services.testsrv_service.manage": { "owner": "default", "value": true } diff --git a/tests/dictionaries/70service_target_engine/tiramisu/base.py b/tests/dictionaries/70service_target_engine/tiramisu/base.py index 77146633..925f9c84 100644 --- a/tests/dictionaries/70service_target_engine/tiramisu/base.py +++ b/tests/dictionaries/70service_target_engine/tiramisu/base.py @@ -19,7 +19,7 @@ option_2 = OptionDescription(name="general", doc="général", children=[option_3 option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2]) option_6 = BoolOption(name="activate", doc="activate", default=True) option_7 = BoolOption(name="manage", doc="manage", default=True) -option_5 = OptionDescription(name="testsrv", doc="testsrv", children=[option_6, option_7]) +option_5 = OptionDescription(name="testsrv_service", doc="testsrv.service", children=[option_6, option_7]) option_5.impl_set_information('target', "test") option_5.impl_set_information('engine', "none") option_4 = OptionDescription(name="services", doc="services", children=[option_5], properties=frozenset({"hidden"})) diff --git a/tests/dictionaries/70service_timer/00-base.xml b/tests/dictionaries/70service_timer/00-base.xml new file mode 100644 index 00000000..2695f7a7 --- /dev/null +++ b/tests/dictionaries/70service_timer/00-base.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/tests/dictionaries/70service_timer/__init__.py b/tests/dictionaries/70service_timer/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/tests/dictionaries/70service_timer/makedict/after.json b/tests/dictionaries/70service_timer/makedict/after.json new file mode 100644 index 00000000..368a0239 --- /dev/null +++ b/tests/dictionaries/70service_timer/makedict/after.json @@ -0,0 +1,18 @@ +{ + "services.testsrv_service.activate": { + "owner": "default", + "value": true + }, + "services.testsrv_service.manage": { + "owner": "default", + "value": true + }, + "services.testsrv_timer.activate": { + "owner": "default", + "value": true + }, + "services.testsrv_timer.manage": { + "owner": "default", + "value": true + } +} diff --git a/tests/dictionaries/70service_timer/makedict/base.json b/tests/dictionaries/70service_timer/makedict/base.json new file mode 100644 index 00000000..9f2eb334 --- /dev/null +++ b/tests/dictionaries/70service_timer/makedict/base.json @@ -0,0 +1,6 @@ +{ + "services.testsrv_service.activate": true, + "services.testsrv_service.manage": true, + "services.testsrv_timer.activate": true, + "services.testsrv_timer.manage": true +} diff --git a/tests/dictionaries/70service_timer/makedict/before.json b/tests/dictionaries/70service_timer/makedict/before.json new file mode 100644 index 00000000..368a0239 --- /dev/null +++ b/tests/dictionaries/70service_timer/makedict/before.json @@ -0,0 +1,18 @@ +{ + "services.testsrv_service.activate": { + "owner": "default", + "value": true + }, + "services.testsrv_service.manage": { + "owner": "default", + "value": true + }, + "services.testsrv_timer.activate": { + "owner": "default", + "value": true + }, + "services.testsrv_timer.manage": { + "owner": "default", + "value": true + } +} diff --git a/tests/dictionaries/70service_timer/result/systemd/system/testsrv.service b/tests/dictionaries/70service_timer/result/systemd/system/testsrv.service new file mode 100644 index 00000000..24e10984 --- /dev/null +++ b/tests/dictionaries/70service_timer/result/systemd/system/testsrv.service @@ -0,0 +1 @@ +service diff --git a/tests/dictionaries/70service_timer/result/systemd/system/testsrv.timer b/tests/dictionaries/70service_timer/result/systemd/system/testsrv.timer new file mode 100644 index 00000000..fe84f2cc --- /dev/null +++ b/tests/dictionaries/70service_timer/result/systemd/system/testsrv.timer @@ -0,0 +1 @@ +timer diff --git a/tests/dictionaries/70service_timer/result/tmpfiles.d/0rougail.conf b/tests/dictionaries/70service_timer/result/tmpfiles.d/0rougail.conf new file mode 100644 index 00000000..e69de29b diff --git a/tests/dictionaries/70service_timer/tiramisu/base.py b/tests/dictionaries/70service_timer/tiramisu/base.py new file mode 100644 index 00000000..49d2b235 --- /dev/null +++ b/tests/dictionaries/70service_timer/tiramisu/base.py @@ -0,0 +1,27 @@ +from importlib.machinery import SourceFileLoader as _SourceFileLoader +from importlib.util import spec_from_loader as _spec_from_loader, module_from_spec as _module_from_spec +class func: + pass +_loader = _SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py') +_spec = _spec_from_loader(_loader.name, _loader) +_func = _module_from_spec(_spec) +_loader.exec_module(_func) +for function in dir(_func): + if function.startswith('_'): + continue + setattr(func, function, getattr(_func, function)) +try: + from tiramisu3 import * +except: + from tiramisu import * +option_3 = BoolOption(name="activate", doc="activate", default=True) +option_4 = BoolOption(name="manage", doc="manage", default=True) +option_2 = OptionDescription(name="testsrv_service", doc="testsrv.service", children=[option_3, option_4]) +option_2.impl_set_information('engine', "none") +option_6 = BoolOption(name="activate", doc="activate", default=True) +option_7 = BoolOption(name="manage", doc="manage", default=True) +option_5 = OptionDescription(name="testsrv_timer", doc="testsrv.timer", children=[option_6, option_7]) +option_5.impl_set_information('type', "timer") +option_5.impl_set_information('engine', "none") +option_1 = OptionDescription(name="services", doc="services", children=[option_2, option_5], properties=frozenset({"hidden"})) +option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1]) diff --git a/tests/dictionaries/70service_timer/tmpl/testsrv.service b/tests/dictionaries/70service_timer/tmpl/testsrv.service new file mode 100644 index 00000000..24e10984 --- /dev/null +++ b/tests/dictionaries/70service_timer/tmpl/testsrv.service @@ -0,0 +1 @@ +service diff --git a/tests/dictionaries/70service_timer/tmpl/testsrv.timer b/tests/dictionaries/70service_timer/tmpl/testsrv.timer new file mode 100644 index 00000000..fe84f2cc --- /dev/null +++ b/tests/dictionaries/70service_timer/tmpl/testsrv.timer @@ -0,0 +1 @@ +timer diff --git a/tests/dictionaries/70services_ip/makedict/after.json b/tests/dictionaries/70services_ip/makedict/after.json index 7090ae97..26fc6478 100644 --- a/tests/dictionaries/70services_ip/makedict/after.json +++ b/tests/dictionaries/70services_ip/makedict/after.json @@ -3,19 +3,19 @@ "owner": "default", "value": "192.168.0.1" }, - "services.nut.ip.nut_monitor_host.name": { + "services.nut_service.ip.nut_monitor_host.name": { "owner": "default", "value": "192.168.0.1" }, - "services.nut.ip.nut_monitor_host.activate": { + "services.nut_service.ip.nut_monitor_host.activate": { "owner": "default", "value": true }, - "services.nut.activate": { + "services.nut_service.activate": { "owner": "default", "value": true }, - "services.nut.manage": { + "services.nut_service.manage": { "owner": "default", "value": true } diff --git a/tests/dictionaries/70services_ip/makedict/base.json b/tests/dictionaries/70services_ip/makedict/base.json index d333bde1..e04c4352 100644 --- a/tests/dictionaries/70services_ip/makedict/base.json +++ b/tests/dictionaries/70services_ip/makedict/base.json @@ -1,7 +1,7 @@ { "rougail.nut_monitor_host": "192.168.0.1", - "services.nut.ip.nut_monitor_host.name": "192.168.0.1", - "services.nut.ip.nut_monitor_host.activate": true, - "services.nut.activate": true, - "services.nut.manage": true + "services.nut_service.ip.nut_monitor_host.name": "192.168.0.1", + "services.nut_service.ip.nut_monitor_host.activate": true, + "services.nut_service.activate": true, + "services.nut_service.manage": true } diff --git a/tests/dictionaries/70services_ip/makedict/before.json b/tests/dictionaries/70services_ip/makedict/before.json index 7090ae97..26fc6478 100644 --- a/tests/dictionaries/70services_ip/makedict/before.json +++ b/tests/dictionaries/70services_ip/makedict/before.json @@ -3,19 +3,19 @@ "owner": "default", "value": "192.168.0.1" }, - "services.nut.ip.nut_monitor_host.name": { + "services.nut_service.ip.nut_monitor_host.name": { "owner": "default", "value": "192.168.0.1" }, - "services.nut.ip.nut_monitor_host.activate": { + "services.nut_service.ip.nut_monitor_host.activate": { "owner": "default", "value": true }, - "services.nut.activate": { + "services.nut_service.activate": { "owner": "default", "value": true }, - "services.nut.manage": { + "services.nut_service.manage": { "owner": "default", "value": true } diff --git a/tests/dictionaries/70services_ip/tiramisu/base.py b/tests/dictionaries/70services_ip/tiramisu/base.py index 4edea6c5..b3cec323 100644 --- a/tests/dictionaries/70services_ip/tiramisu/base.py +++ b/tests/dictionaries/70services_ip/tiramisu/base.py @@ -22,6 +22,6 @@ option_6 = OptionDescription(name="nut_monitor_host", doc="nut_monitor_host", ch option_5 = OptionDescription(name="ip", doc="ip", children=[option_6]) option_9 = BoolOption(name="activate", doc="activate", default=True) option_10 = BoolOption(name="manage", doc="manage", default=True) -option_4 = OptionDescription(name="nut", doc="nut", children=[option_5, option_9, option_10]) +option_4 = OptionDescription(name="nut_service", doc="nut.service", children=[option_5, option_9, option_10]) option_3 = OptionDescription(name="services", doc="services", children=[option_4], properties=frozenset({"hidden"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, option_3]) diff --git a/tests/dictionaries/70services_ip_cidr/makedict/after.json b/tests/dictionaries/70services_ip_cidr/makedict/after.json index f9eedc89..61c4af03 100644 --- a/tests/dictionaries/70services_ip_cidr/makedict/after.json +++ b/tests/dictionaries/70services_ip_cidr/makedict/after.json @@ -3,19 +3,19 @@ "owner": "default", "value": "192.168.0.0/24" }, - "services.nut.ip.nut_monitor_host.name": { + "services.nut_service.ip.nut_monitor_host.name": { "owner": "default", "value": "192.168.0.0/24" }, - "services.nut.ip.nut_monitor_host.activate": { + "services.nut_service.ip.nut_monitor_host.activate": { "owner": "default", "value": true }, - "services.nut.activate": { + "services.nut_service.activate": { "owner": "default", "value": true }, - "services.nut.manage": { + "services.nut_service.manage": { "owner": "default", "value": true } diff --git a/tests/dictionaries/70services_ip_cidr/makedict/base.json b/tests/dictionaries/70services_ip_cidr/makedict/base.json index 9097e24c..f097a8d4 100644 --- a/tests/dictionaries/70services_ip_cidr/makedict/base.json +++ b/tests/dictionaries/70services_ip_cidr/makedict/base.json @@ -1,7 +1,7 @@ { "rougail.nut_monitor_host": "192.168.0.0/24", - "services.nut.ip.nut_monitor_host.name": "192.168.0.0/24", - "services.nut.ip.nut_monitor_host.activate": true, - "services.nut.activate": true, - "services.nut.manage": true + "services.nut_service.ip.nut_monitor_host.name": "192.168.0.0/24", + "services.nut_service.ip.nut_monitor_host.activate": true, + "services.nut_service.activate": true, + "services.nut_service.manage": true } diff --git a/tests/dictionaries/70services_ip_cidr/makedict/before.json b/tests/dictionaries/70services_ip_cidr/makedict/before.json index f9eedc89..61c4af03 100644 --- a/tests/dictionaries/70services_ip_cidr/makedict/before.json +++ b/tests/dictionaries/70services_ip_cidr/makedict/before.json @@ -3,19 +3,19 @@ "owner": "default", "value": "192.168.0.0/24" }, - "services.nut.ip.nut_monitor_host.name": { + "services.nut_service.ip.nut_monitor_host.name": { "owner": "default", "value": "192.168.0.0/24" }, - "services.nut.ip.nut_monitor_host.activate": { + "services.nut_service.ip.nut_monitor_host.activate": { "owner": "default", "value": true }, - "services.nut.activate": { + "services.nut_service.activate": { "owner": "default", "value": true }, - "services.nut.manage": { + "services.nut_service.manage": { "owner": "default", "value": true } diff --git a/tests/dictionaries/70services_ip_cidr/tiramisu/base.py b/tests/dictionaries/70services_ip_cidr/tiramisu/base.py index a3c98dd9..766532a1 100644 --- a/tests/dictionaries/70services_ip_cidr/tiramisu/base.py +++ b/tests/dictionaries/70services_ip_cidr/tiramisu/base.py @@ -22,6 +22,6 @@ option_6 = OptionDescription(name="nut_monitor_host", doc="nut_monitor_host", ch option_5 = OptionDescription(name="ip", doc="ip", children=[option_6]) option_9 = BoolOption(name="activate", doc="activate", default=True) option_10 = BoolOption(name="manage", doc="manage", default=True) -option_4 = OptionDescription(name="nut", doc="nut", children=[option_5, option_9, option_10]) +option_4 = OptionDescription(name="nut_service", doc="nut.service", children=[option_5, option_9, option_10]) option_3 = OptionDescription(name="services", doc="services", children=[option_4], properties=frozenset({"hidden"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, option_3]) diff --git a/tests/dictionaries/70services_ip_disabled/makedict/after.json b/tests/dictionaries/70services_ip_disabled/makedict/after.json index f74a308d..b6f6db5b 100644 --- a/tests/dictionaries/70services_ip_disabled/makedict/after.json +++ b/tests/dictionaries/70services_ip_disabled/makedict/after.json @@ -1,13 +1,13 @@ { - "services.nut.ip.nut_monitor_host.activate": { + "services.nut_service.ip.nut_monitor_host.activate": { "owner": "default", "value": true }, - "services.nut.activate": { + "services.nut_service.activate": { "owner": "default", "value": true }, - "services.nut.manage": { + "services.nut_service.manage": { "owner": "default", "value": true } diff --git a/tests/dictionaries/70services_ip_disabled/makedict/base.json b/tests/dictionaries/70services_ip_disabled/makedict/base.json index 552126f5..66baf2e0 100644 --- a/tests/dictionaries/70services_ip_disabled/makedict/base.json +++ b/tests/dictionaries/70services_ip_disabled/makedict/base.json @@ -1,5 +1,5 @@ { - "services.nut.ip.nut_monitor_host.activate": true, - "services.nut.activate": true, - "services.nut.manage": true + "services.nut_service.ip.nut_monitor_host.activate": true, + "services.nut_service.activate": true, + "services.nut_service.manage": true } diff --git a/tests/dictionaries/70services_ip_disabled/makedict/before.json b/tests/dictionaries/70services_ip_disabled/makedict/before.json index f74a308d..b6f6db5b 100644 --- a/tests/dictionaries/70services_ip_disabled/makedict/before.json +++ b/tests/dictionaries/70services_ip_disabled/makedict/before.json @@ -1,13 +1,13 @@ { - "services.nut.ip.nut_monitor_host.activate": { + "services.nut_service.ip.nut_monitor_host.activate": { "owner": "default", "value": true }, - "services.nut.activate": { + "services.nut_service.activate": { "owner": "default", "value": true }, - "services.nut.manage": { + "services.nut_service.manage": { "owner": "default", "value": true } diff --git a/tests/dictionaries/70services_ip_disabled/tiramisu/base.py b/tests/dictionaries/70services_ip_disabled/tiramisu/base.py index 5c97d767..deb5a1b9 100644 --- a/tests/dictionaries/70services_ip_disabled/tiramisu/base.py +++ b/tests/dictionaries/70services_ip_disabled/tiramisu/base.py @@ -22,6 +22,6 @@ option_6 = OptionDescription(name="nut_monitor_host", doc="nut_monitor_host", ch option_5 = OptionDescription(name="ip", doc="ip", children=[option_6]) option_9 = BoolOption(name="activate", doc="activate", default=True) option_10 = BoolOption(name="manage", doc="manage", default=True) -option_4 = OptionDescription(name="nut", doc="nut", children=[option_5, option_9, option_10]) +option_4 = OptionDescription(name="nut_service", doc="nut.service", children=[option_5, option_9, option_10]) option_3 = OptionDescription(name="services", doc="services", children=[option_4], properties=frozenset({"hidden"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, option_3]) diff --git a/tests/dictionaries/70services_ip_iplist/makedict/after.json b/tests/dictionaries/70services_ip_iplist/makedict/after.json index e182cf46..3cecac4f 100644 --- a/tests/dictionaries/70services_ip_iplist/makedict/after.json +++ b/tests/dictionaries/70services_ip_iplist/makedict/after.json @@ -7,19 +7,19 @@ "owner": "default", "value": "192.168.0.0/24" }, - "services.nut.ip.nut_monitor_host.name": { + "services.nut_service.ip.nut_monitor_host.name": { "owner": "default", "value": "192.168.0.0/24" }, - "services.nut.ip.nut_monitor_host.activate": { + "services.nut_service.ip.nut_monitor_host.activate": { "owner": "default", "value": true }, - "services.nut.activate": { + "services.nut_service.activate": { "owner": "default", "value": true }, - "services.nut.manage": { + "services.nut_service.manage": { "owner": "default", "value": true } diff --git a/tests/dictionaries/70services_ip_iplist/makedict/base.json b/tests/dictionaries/70services_ip_iplist/makedict/base.json index 8c62d10b..aa2bd28e 100644 --- a/tests/dictionaries/70services_ip_iplist/makedict/base.json +++ b/tests/dictionaries/70services_ip_iplist/makedict/base.json @@ -1,8 +1,8 @@ { "rougail.condition": "no", "rougail.nut_monitor_host": "192.168.0.0/24", - "services.nut.ip.nut_monitor_host.name": "192.168.0.0/24", - "services.nut.ip.nut_monitor_host.activate": true, - "services.nut.activate": true, - "services.nut.manage": true + "services.nut_service.ip.nut_monitor_host.name": "192.168.0.0/24", + "services.nut_service.ip.nut_monitor_host.activate": true, + "services.nut_service.activate": true, + "services.nut_service.manage": true } diff --git a/tests/dictionaries/70services_ip_iplist/makedict/before.json b/tests/dictionaries/70services_ip_iplist/makedict/before.json index e182cf46..3cecac4f 100644 --- a/tests/dictionaries/70services_ip_iplist/makedict/before.json +++ b/tests/dictionaries/70services_ip_iplist/makedict/before.json @@ -7,19 +7,19 @@ "owner": "default", "value": "192.168.0.0/24" }, - "services.nut.ip.nut_monitor_host.name": { + "services.nut_service.ip.nut_monitor_host.name": { "owner": "default", "value": "192.168.0.0/24" }, - "services.nut.ip.nut_monitor_host.activate": { + "services.nut_service.ip.nut_monitor_host.activate": { "owner": "default", "value": true }, - "services.nut.activate": { + "services.nut_service.activate": { "owner": "default", "value": true }, - "services.nut.manage": { + "services.nut_service.manage": { "owner": "default", "value": true } diff --git a/tests/dictionaries/70services_ip_iplist/tiramisu/base.py b/tests/dictionaries/70services_ip_iplist/tiramisu/base.py index f718b818..4f35469c 100644 --- a/tests/dictionaries/70services_ip_iplist/tiramisu/base.py +++ b/tests/dictionaries/70services_ip_iplist/tiramisu/base.py @@ -23,6 +23,6 @@ option_7 = OptionDescription(name="nut_monitor_host", doc="nut_monitor_host", ch option_6 = OptionDescription(name="ip", doc="ip", children=[option_7]) option_10 = BoolOption(name="activate", doc="activate", default=True) option_11 = BoolOption(name="manage", doc="manage", default=True) -option_5 = OptionDescription(name="nut", doc="nut", children=[option_6, option_10, option_11]) +option_5 = OptionDescription(name="nut_service", doc="nut.service", children=[option_6, option_10, option_11]) 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]) diff --git a/tests/dictionaries/70services_ip_iplist2/makedict/after.json b/tests/dictionaries/70services_ip_iplist2/makedict/after.json index 75059141..0457a248 100644 --- a/tests/dictionaries/70services_ip_iplist2/makedict/after.json +++ b/tests/dictionaries/70services_ip_iplist2/makedict/after.json @@ -7,19 +7,19 @@ "owner": "default", "value": "192.168.0.0/24" }, - "services.nut.ip.nut_monitor_host.name": { + "services.nut_service.ip.nut_monitor_host.name": { "owner": "default", "value": "192.168.0.0/24" }, - "services.nut.ip.nut_monitor_host.activate": { + "services.nut_service.ip.nut_monitor_host.activate": { "owner": "default", "value": false }, - "services.nut.activate": { + "services.nut_service.activate": { "owner": "default", "value": true }, - "services.nut.manage": { + "services.nut_service.manage": { "owner": "default", "value": true } diff --git a/tests/dictionaries/70services_ip_iplist2/makedict/base.json b/tests/dictionaries/70services_ip_iplist2/makedict/base.json index 8c1cc4a7..f6518192 100644 --- a/tests/dictionaries/70services_ip_iplist2/makedict/base.json +++ b/tests/dictionaries/70services_ip_iplist2/makedict/base.json @@ -1,8 +1,8 @@ { "rougail.condition": "yes", "rougail.nut_monitor_host": "192.168.0.0/24", - "services.nut.ip.nut_monitor_host.name": "192.168.0.0/24", - "services.nut.ip.nut_monitor_host.activate": false, - "services.nut.activate": true, - "services.nut.manage": true + "services.nut_service.ip.nut_monitor_host.name": "192.168.0.0/24", + "services.nut_service.ip.nut_monitor_host.activate": false, + "services.nut_service.activate": true, + "services.nut_service.manage": true } diff --git a/tests/dictionaries/70services_ip_iplist2/makedict/before.json b/tests/dictionaries/70services_ip_iplist2/makedict/before.json index 75059141..0457a248 100644 --- a/tests/dictionaries/70services_ip_iplist2/makedict/before.json +++ b/tests/dictionaries/70services_ip_iplist2/makedict/before.json @@ -7,19 +7,19 @@ "owner": "default", "value": "192.168.0.0/24" }, - "services.nut.ip.nut_monitor_host.name": { + "services.nut_service.ip.nut_monitor_host.name": { "owner": "default", "value": "192.168.0.0/24" }, - "services.nut.ip.nut_monitor_host.activate": { + "services.nut_service.ip.nut_monitor_host.activate": { "owner": "default", "value": false }, - "services.nut.activate": { + "services.nut_service.activate": { "owner": "default", "value": true }, - "services.nut.manage": { + "services.nut_service.manage": { "owner": "default", "value": true } diff --git a/tests/dictionaries/70services_ip_iplist2/tiramisu/base.py b/tests/dictionaries/70services_ip_iplist2/tiramisu/base.py index f5ab912b..1fc663ed 100644 --- a/tests/dictionaries/70services_ip_iplist2/tiramisu/base.py +++ b/tests/dictionaries/70services_ip_iplist2/tiramisu/base.py @@ -23,6 +23,6 @@ option_7 = OptionDescription(name="nut_monitor_host", doc="nut_monitor_host", ch option_6 = OptionDescription(name="ip", doc="ip", children=[option_7]) option_10 = BoolOption(name="activate", doc="activate", default=True) option_11 = BoolOption(name="manage", doc="manage", default=True) -option_5 = OptionDescription(name="nut", doc="nut", children=[option_6, option_10, option_11]) +option_5 = OptionDescription(name="nut_service", doc="nut.service", children=[option_6, option_10, option_11]) 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]) diff --git a/tests/dictionaries/70services_ip_leadership/makedict/after.json b/tests/dictionaries/70services_ip_leadership/makedict/after.json index 5a0141a7..da2c33b9 100644 --- a/tests/dictionaries/70services_ip_leadership/makedict/after.json +++ b/tests/dictionaries/70services_ip_leadership/makedict/after.json @@ -13,7 +13,7 @@ "192.168.1.0" ] }, - "services.ntp.ip.nut_monitor_host.name": { + "services.ntp_service.ip.nut_monitor_host.name": { "owner": [ "default" ], @@ -21,21 +21,21 @@ "192.168.1.0" ] }, - "services.ntp.ip.nut_monitor_host.netmask": { + "services.ntp_service.ip.nut_monitor_host.netmask": { "owner": "default", "value": [ "255.255.255.0" ] }, - "services.ntp.ip.nut_monitor_host.activate": { + "services.ntp_service.ip.nut_monitor_host.activate": { "owner": "default", "value": true }, - "services.ntp.activate": { + "services.ntp_service.activate": { "owner": "default", "value": true }, - "services.ntp.manage": { + "services.ntp_service.manage": { "owner": "default", "value": true } diff --git a/tests/dictionaries/70services_ip_leadership/makedict/base.json b/tests/dictionaries/70services_ip_leadership/makedict/base.json index af10e88a..074d4206 100644 --- a/tests/dictionaries/70services_ip_leadership/makedict/base.json +++ b/tests/dictionaries/70services_ip_leadership/makedict/base.json @@ -5,13 +5,13 @@ "rougail.general.nut_monitor_netmask.nut_monitor_host": "192.168.1.0" } ], - "services.ntp.ip.nut_monitor_host.name": [ + "services.ntp_service.ip.nut_monitor_host.name": [ "192.168.1.0" ], - "services.ntp.ip.nut_monitor_host.netmask": [ + "services.ntp_service.ip.nut_monitor_host.netmask": [ "255.255.255.0" ], - "services.ntp.ip.nut_monitor_host.activate": true, - "services.ntp.activate": true, - "services.ntp.manage": true + "services.ntp_service.ip.nut_monitor_host.activate": true, + "services.ntp_service.activate": true, + "services.ntp_service.manage": true } diff --git a/tests/dictionaries/70services_ip_leadership/makedict/before.json b/tests/dictionaries/70services_ip_leadership/makedict/before.json index 5a0141a7..da2c33b9 100644 --- a/tests/dictionaries/70services_ip_leadership/makedict/before.json +++ b/tests/dictionaries/70services_ip_leadership/makedict/before.json @@ -13,7 +13,7 @@ "192.168.1.0" ] }, - "services.ntp.ip.nut_monitor_host.name": { + "services.ntp_service.ip.nut_monitor_host.name": { "owner": [ "default" ], @@ -21,21 +21,21 @@ "192.168.1.0" ] }, - "services.ntp.ip.nut_monitor_host.netmask": { + "services.ntp_service.ip.nut_monitor_host.netmask": { "owner": "default", "value": [ "255.255.255.0" ] }, - "services.ntp.ip.nut_monitor_host.activate": { + "services.ntp_service.ip.nut_monitor_host.activate": { "owner": "default", "value": true }, - "services.ntp.activate": { + "services.ntp_service.activate": { "owner": "default", "value": true }, - "services.ntp.manage": { + "services.ntp_service.manage": { "owner": "default", "value": true } diff --git a/tests/dictionaries/70services_ip_leadership/tiramisu/base.py b/tests/dictionaries/70services_ip_leadership/tiramisu/base.py index 5fff3e35..135caebb 100644 --- a/tests/dictionaries/70services_ip_leadership/tiramisu/base.py +++ b/tests/dictionaries/70services_ip_leadership/tiramisu/base.py @@ -26,6 +26,6 @@ option_9 = OptionDescription(name="nut_monitor_host", doc="nut_monitor_host", ch option_8 = OptionDescription(name="ip", doc="ip", children=[option_9]) option_13 = BoolOption(name="activate", doc="activate", default=True) option_14 = BoolOption(name="manage", doc="manage", default=True) -option_7 = OptionDescription(name="ntp", doc="ntp", children=[option_8, option_13, option_14]) +option_7 = OptionDescription(name="ntp_service", doc="ntp.service", children=[option_8, option_13, option_14]) 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]) diff --git a/tests/dictionaries/70services_ip_multi/makedict/after.json b/tests/dictionaries/70services_ip_multi/makedict/after.json index c8561374..3d67a556 100644 --- a/tests/dictionaries/70services_ip_multi/makedict/after.json +++ b/tests/dictionaries/70services_ip_multi/makedict/after.json @@ -6,22 +6,22 @@ "192.168.0.2" ] }, - "services.nut.ip.nut_monitor_host.name": { + "services.nut_service.ip.nut_monitor_host.name": { "owner": "default", "value": [ "192.168.0.1", "192.168.0.2" ] }, - "services.nut.ip.nut_monitor_host.activate": { + "services.nut_service.ip.nut_monitor_host.activate": { "owner": "default", "value": true }, - "services.nut.activate": { + "services.nut_service.activate": { "owner": "default", "value": true }, - "services.nut.manage": { + "services.nut_service.manage": { "owner": "default", "value": true } diff --git a/tests/dictionaries/70services_ip_multi/makedict/base.json b/tests/dictionaries/70services_ip_multi/makedict/base.json index 9e7241f3..72e97674 100644 --- a/tests/dictionaries/70services_ip_multi/makedict/base.json +++ b/tests/dictionaries/70services_ip_multi/makedict/base.json @@ -3,11 +3,11 @@ "192.168.0.1", "192.168.0.2" ], - "services.nut.ip.nut_monitor_host.name": [ + "services.nut_service.ip.nut_monitor_host.name": [ "192.168.0.1", "192.168.0.2" ], - "services.nut.ip.nut_monitor_host.activate": true, - "services.nut.activate": true, - "services.nut.manage": true + "services.nut_service.ip.nut_monitor_host.activate": true, + "services.nut_service.activate": true, + "services.nut_service.manage": true } diff --git a/tests/dictionaries/70services_ip_multi/makedict/before.json b/tests/dictionaries/70services_ip_multi/makedict/before.json index c8561374..3d67a556 100644 --- a/tests/dictionaries/70services_ip_multi/makedict/before.json +++ b/tests/dictionaries/70services_ip_multi/makedict/before.json @@ -6,22 +6,22 @@ "192.168.0.2" ] }, - "services.nut.ip.nut_monitor_host.name": { + "services.nut_service.ip.nut_monitor_host.name": { "owner": "default", "value": [ "192.168.0.1", "192.168.0.2" ] }, - "services.nut.ip.nut_monitor_host.activate": { + "services.nut_service.ip.nut_monitor_host.activate": { "owner": "default", "value": true }, - "services.nut.activate": { + "services.nut_service.activate": { "owner": "default", "value": true }, - "services.nut.manage": { + "services.nut_service.manage": { "owner": "default", "value": true } diff --git a/tests/dictionaries/70services_ip_multi/tiramisu/base.py b/tests/dictionaries/70services_ip_multi/tiramisu/base.py index ed9fb7c6..a07c63f8 100644 --- a/tests/dictionaries/70services_ip_multi/tiramisu/base.py +++ b/tests/dictionaries/70services_ip_multi/tiramisu/base.py @@ -22,6 +22,6 @@ option_6 = OptionDescription(name="nut_monitor_host", doc="nut_monitor_host", ch option_5 = OptionDescription(name="ip", doc="ip", children=[option_6]) option_9 = BoolOption(name="activate", doc="activate", default=True) option_10 = BoolOption(name="manage", doc="manage", default=True) -option_4 = OptionDescription(name="nut", doc="nut", children=[option_5, option_9, option_10]) +option_4 = OptionDescription(name="nut_service", doc="nut.service", children=[option_5, option_9, option_10]) option_3 = OptionDescription(name="services", doc="services", children=[option_4], properties=frozenset({"hidden"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, option_3]) diff --git a/tests/dictionaries/70services_ip_network/makedict/after.json b/tests/dictionaries/70services_ip_network/makedict/after.json index 64270526..015fba97 100644 --- a/tests/dictionaries/70services_ip_network/makedict/after.json +++ b/tests/dictionaries/70services_ip_network/makedict/after.json @@ -7,23 +7,23 @@ "owner": "default", "value": "192.168.0.0" }, - "services.nut.ip.nut_monitor_host.name": { + "services.nut_service.ip.nut_monitor_host.name": { "owner": "default", "value": "192.168.0.0" }, - "services.nut.ip.nut_monitor_host.netmask": { + "services.nut_service.ip.nut_monitor_host.netmask": { "owner": "default", "value": "255.255.255.0" }, - "services.nut.ip.nut_monitor_host.activate": { + "services.nut_service.ip.nut_monitor_host.activate": { "owner": "default", "value": true }, - "services.nut.activate": { + "services.nut_service.activate": { "owner": "default", "value": true }, - "services.nut.manage": { + "services.nut_service.manage": { "owner": "default", "value": true } diff --git a/tests/dictionaries/70services_ip_network/makedict/base.json b/tests/dictionaries/70services_ip_network/makedict/base.json index dc76fb00..41a76e45 100644 --- a/tests/dictionaries/70services_ip_network/makedict/base.json +++ b/tests/dictionaries/70services_ip_network/makedict/base.json @@ -1,9 +1,9 @@ { "rougail.nut_monitor_netmask": "255.255.255.0", "rougail.nut_monitor_host": "192.168.0.0", - "services.nut.ip.nut_monitor_host.name": "192.168.0.0", - "services.nut.ip.nut_monitor_host.netmask": "255.255.255.0", - "services.nut.ip.nut_monitor_host.activate": true, - "services.nut.activate": true, - "services.nut.manage": true + "services.nut_service.ip.nut_monitor_host.name": "192.168.0.0", + "services.nut_service.ip.nut_monitor_host.netmask": "255.255.255.0", + "services.nut_service.ip.nut_monitor_host.activate": true, + "services.nut_service.activate": true, + "services.nut_service.manage": true } diff --git a/tests/dictionaries/70services_ip_network/makedict/before.json b/tests/dictionaries/70services_ip_network/makedict/before.json index 64270526..015fba97 100644 --- a/tests/dictionaries/70services_ip_network/makedict/before.json +++ b/tests/dictionaries/70services_ip_network/makedict/before.json @@ -7,23 +7,23 @@ "owner": "default", "value": "192.168.0.0" }, - "services.nut.ip.nut_monitor_host.name": { + "services.nut_service.ip.nut_monitor_host.name": { "owner": "default", "value": "192.168.0.0" }, - "services.nut.ip.nut_monitor_host.netmask": { + "services.nut_service.ip.nut_monitor_host.netmask": { "owner": "default", "value": "255.255.255.0" }, - "services.nut.ip.nut_monitor_host.activate": { + "services.nut_service.ip.nut_monitor_host.activate": { "owner": "default", "value": true }, - "services.nut.activate": { + "services.nut_service.activate": { "owner": "default", "value": true }, - "services.nut.manage": { + "services.nut_service.manage": { "owner": "default", "value": true } diff --git a/tests/dictionaries/70services_ip_network/tiramisu/base.py b/tests/dictionaries/70services_ip_network/tiramisu/base.py index bf24daaf..6170eeef 100644 --- a/tests/dictionaries/70services_ip_network/tiramisu/base.py +++ b/tests/dictionaries/70services_ip_network/tiramisu/base.py @@ -24,6 +24,6 @@ option_7 = OptionDescription(name="nut_monitor_host", doc="nut_monitor_host", ch option_6 = OptionDescription(name="ip", doc="ip", children=[option_7]) option_11 = BoolOption(name="activate", doc="activate", default=True) option_12 = BoolOption(name="manage", doc="manage", default=True) -option_5 = OptionDescription(name="nut", doc="nut", children=[option_6, option_11, option_12]) +option_5 = OptionDescription(name="nut_service", doc="nut.service", children=[option_6, option_11, option_12]) 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]) diff --git a/tests/dictionaries/70services_ip_not_mandatory/makedict/after.json b/tests/dictionaries/70services_ip_not_mandatory/makedict/after.json index 048ea242..fceae0be 100644 --- a/tests/dictionaries/70services_ip_not_mandatory/makedict/after.json +++ b/tests/dictionaries/70services_ip_not_mandatory/makedict/after.json @@ -3,19 +3,19 @@ "owner": "default", "value": null }, - "services.nut.ip.nut_monitor_host.name": { + "services.nut_service.ip.nut_monitor_host.name": { "owner": "default", "value": null }, - "services.nut.ip.nut_monitor_host.activate": { + "services.nut_service.ip.nut_monitor_host.activate": { "owner": "default", "value": true }, - "services.nut.activate": { + "services.nut_service.activate": { "owner": "default", "value": true }, - "services.nut.manage": { + "services.nut_service.manage": { "owner": "default", "value": true } diff --git a/tests/dictionaries/70services_ip_not_mandatory/makedict/base.json b/tests/dictionaries/70services_ip_not_mandatory/makedict/base.json index d3ad5532..900a1b0c 100644 --- a/tests/dictionaries/70services_ip_not_mandatory/makedict/base.json +++ b/tests/dictionaries/70services_ip_not_mandatory/makedict/base.json @@ -1,7 +1,7 @@ { "rougail.nut_monitor_host": null, - "services.nut.ip.nut_monitor_host.name": null, - "services.nut.ip.nut_monitor_host.activate": true, - "services.nut.activate": true, - "services.nut.manage": true + "services.nut_service.ip.nut_monitor_host.name": null, + "services.nut_service.ip.nut_monitor_host.activate": true, + "services.nut_service.activate": true, + "services.nut_service.manage": true } diff --git a/tests/dictionaries/70services_ip_not_mandatory/makedict/before.json b/tests/dictionaries/70services_ip_not_mandatory/makedict/before.json index 048ea242..fceae0be 100644 --- a/tests/dictionaries/70services_ip_not_mandatory/makedict/before.json +++ b/tests/dictionaries/70services_ip_not_mandatory/makedict/before.json @@ -3,19 +3,19 @@ "owner": "default", "value": null }, - "services.nut.ip.nut_monitor_host.name": { + "services.nut_service.ip.nut_monitor_host.name": { "owner": "default", "value": null }, - "services.nut.ip.nut_monitor_host.activate": { + "services.nut_service.ip.nut_monitor_host.activate": { "owner": "default", "value": true }, - "services.nut.activate": { + "services.nut_service.activate": { "owner": "default", "value": true }, - "services.nut.manage": { + "services.nut_service.manage": { "owner": "default", "value": true } diff --git a/tests/dictionaries/70services_ip_not_mandatory/tiramisu/base.py b/tests/dictionaries/70services_ip_not_mandatory/tiramisu/base.py index 7c6513fb..2dd13ac4 100644 --- a/tests/dictionaries/70services_ip_not_mandatory/tiramisu/base.py +++ b/tests/dictionaries/70services_ip_not_mandatory/tiramisu/base.py @@ -22,6 +22,6 @@ option_6 = OptionDescription(name="nut_monitor_host", doc="nut_monitor_host", ch option_5 = OptionDescription(name="ip", doc="ip", children=[option_6]) option_9 = BoolOption(name="activate", doc="activate", default=True) option_10 = BoolOption(name="manage", doc="manage", default=True) -option_4 = OptionDescription(name="nut", doc="nut", children=[option_5, option_9, option_10]) +option_4 = OptionDescription(name="nut_service", doc="nut.service", children=[option_5, option_9, option_10]) option_3 = OptionDescription(name="services", doc="services", children=[option_4], properties=frozenset({"hidden"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, option_3]) diff --git a/tests/dictionaries/70services_ip_twice/makedict/after.json b/tests/dictionaries/70services_ip_twice/makedict/after.json index 484c66ab..72a9ac45 100644 --- a/tests/dictionaries/70services_ip_twice/makedict/after.json +++ b/tests/dictionaries/70services_ip_twice/makedict/after.json @@ -7,27 +7,27 @@ "owner": "default", "value": "192.168.0.2" }, - "services.nut.ip.nut_monitor_host.name": { + "services.nut_service.ip.nut_monitor_host.name": { "owner": "default", "value": "192.168.0.1" }, - "services.nut.ip.nut_monitor_host.activate": { + "services.nut_service.ip.nut_monitor_host.activate": { "owner": "default", "value": true }, - "services.nut.ip.nut_monitor_host2.name": { + "services.nut_service.ip.nut_monitor_host2.name": { "owner": "default", "value": "192.168.0.2" }, - "services.nut.ip.nut_monitor_host2.activate": { + "services.nut_service.ip.nut_monitor_host2.activate": { "owner": "default", "value": true }, - "services.nut.activate": { + "services.nut_service.activate": { "owner": "default", "value": true }, - "services.nut.manage": { + "services.nut_service.manage": { "owner": "default", "value": true } diff --git a/tests/dictionaries/70services_ip_twice/makedict/base.json b/tests/dictionaries/70services_ip_twice/makedict/base.json index 3b6d2551..a0fd5743 100644 --- a/tests/dictionaries/70services_ip_twice/makedict/base.json +++ b/tests/dictionaries/70services_ip_twice/makedict/base.json @@ -1,10 +1,10 @@ { "rougail.nut_monitor_host": "192.168.0.1", "rougail.nut_monitor_host2": "192.168.0.2", - "services.nut.ip.nut_monitor_host.name": "192.168.0.1", - "services.nut.ip.nut_monitor_host.activate": true, - "services.nut.ip.nut_monitor_host2.name": "192.168.0.2", - "services.nut.ip.nut_monitor_host2.activate": true, - "services.nut.activate": true, - "services.nut.manage": true + "services.nut_service.ip.nut_monitor_host.name": "192.168.0.1", + "services.nut_service.ip.nut_monitor_host.activate": true, + "services.nut_service.ip.nut_monitor_host2.name": "192.168.0.2", + "services.nut_service.ip.nut_monitor_host2.activate": true, + "services.nut_service.activate": true, + "services.nut_service.manage": true } diff --git a/tests/dictionaries/70services_ip_twice/makedict/before.json b/tests/dictionaries/70services_ip_twice/makedict/before.json index 484c66ab..72a9ac45 100644 --- a/tests/dictionaries/70services_ip_twice/makedict/before.json +++ b/tests/dictionaries/70services_ip_twice/makedict/before.json @@ -7,27 +7,27 @@ "owner": "default", "value": "192.168.0.2" }, - "services.nut.ip.nut_monitor_host.name": { + "services.nut_service.ip.nut_monitor_host.name": { "owner": "default", "value": "192.168.0.1" }, - "services.nut.ip.nut_monitor_host.activate": { + "services.nut_service.ip.nut_monitor_host.activate": { "owner": "default", "value": true }, - "services.nut.ip.nut_monitor_host2.name": { + "services.nut_service.ip.nut_monitor_host2.name": { "owner": "default", "value": "192.168.0.2" }, - "services.nut.ip.nut_monitor_host2.activate": { + "services.nut_service.ip.nut_monitor_host2.activate": { "owner": "default", "value": true }, - "services.nut.activate": { + "services.nut_service.activate": { "owner": "default", "value": true }, - "services.nut.manage": { + "services.nut_service.manage": { "owner": "default", "value": true } diff --git a/tests/dictionaries/70services_ip_twice/tiramisu/base.py b/tests/dictionaries/70services_ip_twice/tiramisu/base.py index 67d5c69e..881bdda7 100644 --- a/tests/dictionaries/70services_ip_twice/tiramisu/base.py +++ b/tests/dictionaries/70services_ip_twice/tiramisu/base.py @@ -26,6 +26,6 @@ option_10 = OptionDescription(name="nut_monitor_host2", doc="nut_monitor_host2", option_6 = OptionDescription(name="ip", doc="ip", children=[option_7, option_10]) option_13 = BoolOption(name="activate", doc="activate", default=True) option_14 = BoolOption(name="manage", doc="manage", default=True) -option_5 = OptionDescription(name="nut", doc="nut", children=[option_6, option_13, option_14]) +option_5 = OptionDescription(name="nut_service", doc="nut.service", children=[option_6, option_13, option_14]) 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])