diff --git a/src/rougail/annotator/property.py b/src/rougail/annotator/property.py
index 0ce81be70..de67a090e 100644
--- a/src/rougail/annotator/property.py
+++ b/src/rougail/annotator/property.py
@@ -77,6 +77,10 @@ class Annotator(Walk):
variable.force_default_on_freeze = True
if not hasattr(variable, 'properties'):
variable.properties = []
+ if 'mandatory' in vars(variable) and not variable.mandatory and variable.multi:
+ # a multi could not have "None" has value
+ # to permit it, just add mandatory="False"
+ variable.properties.append('notempty')
for prop in PROPERTIES:
if hasattr(variable, prop):
if getattr(variable, prop) is True:
diff --git a/src/rougail/annotator/service.py b/src/rougail/annotator/service.py
index 295d26407..7f0e8e207 100644
--- a/src/rougail/annotator/service.py
+++ b/src/rougail/annotator/service.py
@@ -42,7 +42,7 @@ except ModuleNotFoundError:
# that shall not be present in the exported (flatened) XML
ERASED_ATTRIBUTES = ('redefine', 'namespace', 'xmlfiles', 'disabled', 'name', 'manage')
ERASED_ATTRIBUTES2 = ('redefine', 'namespace', 'xmlfiles', 'disabled')
-ALLOW_ATTRIBUT_NOT_MANAGE = ['file', 'engine', 'target']
+ALLOW_ATTRIBUT_NOT_MANAGE = ['file', 'engine', 'target', 'certificate']
FORCE_INFORMATIONS = ['mode']
@@ -319,7 +319,7 @@ class Annotator:
)
variable.multi = None
needed_type = self.objectspace.types[dtd_key_type]
- if needed_type not in ('variable', variable.opt.type):
+ if elttype != 'certificate' and needed_type not in ('variable', variable.opt.type):
msg = _(f'"{value}" in "{elttype}" must be a variable with type '
f'"{needed_type}" not "{variable.opt.type}"')
raise DictConsistencyError(msg, 58, elt.xmlfiles)
@@ -399,72 +399,22 @@ class Annotator:
certificate_name,
path_prefix,
) -> None:
- if hasattr(certificate, 'certificate_type') and certificate.certificate_type == 'variable':
+ if certificate.certificate_type == "variable":
variable = self.objectspace.paths.get_variable(certificate.name,
certificate.namespace,
xmlfiles=certificate.xmlfiles,
force_path_prefix=path_prefix,
add_path_prefix=True,
)
- if variable.type != 'filename':
- msg = _(f'certificate cannot be linked to "{variable.type}" variable "{certificate.name}"')
- raise DictConsistencyError(msg, 90, certificate.xmlfiles)
- else:
- option = CONVERT_OPTION['filename']
- value = certificate.name
- try:
- value = option.get('func', str)(value)
- getattr(tiramisu, option['opttype'])('test',
- 'Object to valid value',
- value,
- **option.get('initkwargs', {}),
- )
- except ValueError as err:
- msg = _(f'certificate "{value}" is not a valid "filename"')
- raise DictConsistencyError(msg, 94, certificate.xmlfiles) from err
- if hasattr(certificate, 'private_type') and certificate.private_type == 'variable':
- variable = self.objectspace.paths.get_variable(certificate.private,
- certificate.namespace,
- xmlfiles=certificate.xmlfiles,
- force_path_prefix=path_prefix,
- add_path_prefix=True,
- )
- if variable.type != 'filename':
- msg = _(f'private cannot be linked to "{variable.type}" variable "{certificate.private}" for certificate "{certificate.name}"')
- raise DictConsistencyError(msg, 91, certificate.xmlfiles)
- else:
- option = CONVERT_OPTION['filename']
- value = certificate.private
- try:
- value = option.get('func', str)(value)
- getattr(tiramisu, option['opttype'])('test',
- 'Object to valid value',
- value,
- **option.get('initkwargs', {}),
- )
- except ValueError as err:
- msg = _(f'authority "{value}" is not a valid "filename"')
- raise DictConsistencyError(msg, 95, certificate.xmlfiles) from err
- if hasattr(certificate, 'authority_type') and certificate.authority_type == 'variable':
- variable = self.objectspace.paths.get_variable(certificate.authority,
- certificate.namespace,
- xmlfiles=certificate.xmlfiles,
- force_path_prefix=path_prefix,
- add_path_prefix=True,
- )
- if variable.type != 'filename':
- msg = _(f'authority cannot be linked to "{variable.type}" variable "{certificate.authority}" for certificate "{certificate.name}"')
- raise DictConsistencyError(msg, 92, certificate.xmlfiles)
- else:
- option = CONVERT_OPTION['filename']
- value = certificate.authority
- try:
- value = option.get('func', str)(value)
- getattr(tiramisu, option['opttype'])('test',
- 'Object to valid value',
- value,
- **option.get('initkwargs', {}),
- )
- except ValueError as err:
- msg = _(f'private "{value}" is not a valid "filename"')
- raise DictConsistencyError(msg, 96, certificate.xmlfiles) from err
+ certificate.catype = certificate.type
+ if not hasattr(certificate, 'domain'):
+ certificate.domain = self.objectspace.rougailconfig['default_cerficate_domain']
+ variable = self.objectspace.paths.get_variable(certificate.domain,
+ certificate.namespace,
+ xmlfiles=certificate.xmlfiles,
+ force_path_prefix=path_prefix,
+ add_path_prefix=True,
+ )
+ if variable.type != 'domainname':
+ msg = _(f'the certificate "{certificate.name}" has an attribute "domain" linked with a "{variable.type}" variable ("{certificate.domain}"), but must be a "domainename" variable')
+ raise DictConsistencyError(msg, 94, certificate.xmlfiles)
diff --git a/src/rougail/annotator/value.py b/src/rougail/annotator/value.py
index 1cfe6932c..320a6cdea 100644
--- a/src/rougail/annotator/value.py
+++ b/src/rougail/annotator/value.py
@@ -67,7 +67,7 @@ class Annotator(Walk): # pylint: disable=R0903
if hasattr(variable, 'value') and variable.value:
has_value = True
for value in variable.value:
- if value.type == 'calculation':
+ if value.type == 'calculation' or value.type == 'nil':
has_value = False
break
if has_value and 'mandatory' not in vars(variable):
@@ -98,6 +98,8 @@ class Annotator(Walk): # pylint: disable=R0903
del variable.value
def add_choice_nil(self) -> None:
+ """A variable with type "Choice" that is not mandatory must has "nil" value
+ """
for variable in self.get_variables():
if variable.type != 'choice':
continue
diff --git a/src/rougail/annotator/variable.py b/src/rougail/annotator/variable.py
index bfc83e3cd..40efadbf0 100644
--- a/src/rougail/annotator/variable.py
+++ b/src/rougail/annotator/variable.py
@@ -162,21 +162,20 @@ class Annotator(Walk): # pylint: disable=R0903
if variable.type != 'symlink' and not hasattr(variable, 'description'):
variable.description = variable.name
if hasattr(variable, 'value'):
- value_to_del = []
for idx, value in enumerate(variable.value):
- if not hasattr(value, 'name'):
- value_to_del.append(idx)
- else:
- if not hasattr(value, 'type'):
- value.type = variable.type
+ if not hasattr(value, 'name') and not hasattr(value, 'type'):
+ msg = 'value without value, if you want the value None, set value type to nil'
+ raise DictConsistencyError(msg, 95, value.xmlfiles)
+ if not hasattr(value, 'type'):
+ value.type = variable.type
+ if hasattr(value, 'name'):
try:
value.name = CONVERT_OPTION.get(value.type, {}).get('func', str)(value.name)
except Exception as err:
msg = _(f'the variable "{variable.name}" has an incorrect value "{value.name}" with "{variable.type}" type')
raise DictConsistencyError(msg, 88, variable.xmlfiles)
- value_to_del.sort(reverse=True)
- for idx in value_to_del:
- del variable.value[idx]
+ else:
+ value.name = None
if not variable.value:
del variable.value
if hasattr(variable, 'choice'):
diff --git a/src/rougail/config.py b/src/rougail/config.py
index 8b906834f..365b168d1 100644
--- a/src/rougail/config.py
+++ b/src/rougail/config.py
@@ -69,6 +69,7 @@ RougailConfig = {'dictionaries_dir': [join(ROUGAILROOT, 'dictionaries')],
'default_files_included': 'no',
'default_overrides_engine': 'cheetah',
'default_service_names_engine': 'none',
+ 'default_cerficate_domain': 'server_name',
'base_option_name': 'baseoption',
'export_with_import': True,
'force_convert_dyn_option_description': False,
diff --git a/src/rougail/data/rougail.dtd b/src/rougail/data/rougail.dtd
index 86ca62208..f82882f16 100644
--- a/src/rougail/data/rougail.dtd
+++ b/src/rougail/data/rougail.dtd
@@ -88,15 +88,19 @@
-
-
-
-
+
-
-
+
+
+
+
+
+
+
+
+
diff --git a/src/rougail/data/rougail.yml b/src/rougail/data/rougail.yml
index 1fc2ab2aa..5afd74486 100644
--- a/src/rougail/data/rougail.yml
+++ b/src/rougail/data/rougail.yml
@@ -121,8 +121,26 @@ mapping:
certificate_type:
type: str
enum:
- - "filename"
- "variable"
+ redefine:
+ type: bool
+ type:
+ type: str
+ enum:
+ - "client"
+ - "server"
+ domain_type:
+ type: str
+ enum:
+ - "variable"
+ domain:
+ type: str
+ server_type:
+ type: str
+ enum:
+ - "variable"
+ server:
+ type: str
group_type:
type: str
enum:
@@ -137,20 +155,18 @@ mapping:
- "variable"
owner:
type: str
- authority:
- type: str
authority_type:
type: str
enum:
- - "filename"
- "variable"
- private:
+ authority:
type: str
private_type:
type: str
enum:
- - "filename"
- "variable"
+ private:
+ type: str
name:
type: str
undisable:
diff --git a/src/rougail/template/base.py b/src/rougail/template/base.py
index 9e9fb2145..fdb620c40 100644
--- a/src/rougail/template/base.py
+++ b/src/rougail/template/base.py
@@ -63,6 +63,7 @@ log.addHandler(logging.NullHandler())
INFORMATIONS = {'files': ['mode', 'engine', 'included'],
'overrides': ['name', 'source', 'engine'],
'service_names': ['doc', 'engine', 'type', 'target', 'undisable'],
+ 'certificates': ['authority', 'format'],
}
DEFAULT = {'files': ['owner', 'group'],
'overrides': [],
@@ -218,6 +219,9 @@ class RougailExtra:
def __str__(self):
return f'RougailExtra("{self._name}") => {self._suboption}'
+ def __contains__(self, value):
+ return self._suboption.__contains__(value)
+
class RougailBaseTemplate:
"""Engine to process Creole cheetah template
@@ -296,6 +300,7 @@ class RougailBaseTemplate:
filevar: Dict,
type_: str,
service_name: str,
+ extra_variables: str,
) -> str:
"""Run templatisation on one file
"""
@@ -343,6 +348,7 @@ class RougailBaseTemplate:
index=idx,
rougail_variables_dict=self.rougail_variables_dict,
eosfunc=self.eosfunc,
+ extra_variables=extra_variables,
)
self.process(true_destfilename,
destfilename,
@@ -366,7 +372,10 @@ class RougailBaseTemplate:
is_service_namespace,
)
- async def instance_file(self, template_name) -> None:
+ async def instance_file(self,
+ template_name,
+ extra_variables=None,
+ ) -> None:
if not self.rougail_variables_dict:
await self.load_variables()
self.prepare_templates()
@@ -396,6 +405,7 @@ class RougailBaseTemplate:
self._instance_file(fill,
type_,
service_name,
+ extra_variables,
)
except Exception as err:
if ori_dir is not None:
@@ -407,7 +417,9 @@ class RougailBaseTemplate:
raise TemplateError(f'Cannot find template {template_name}')
- async def instance_files(self) -> None:
+ async def instance_files(self,
+ extra_variables=None,
+ ) -> None:
"""Run templatisation on all files
"""
try:
@@ -433,6 +445,7 @@ class RougailBaseTemplate:
self._instance_file({'engine': engine},
'service',
service_name,
+ extra_variables,
)
target_name = await service_obj.information.get('target', None)
if target_name:
@@ -456,6 +469,7 @@ class RougailBaseTemplate:
destfilenames = self._instance_file(fill,
type_,
service_name,
+ extra_variables,
)
if included and fill.get('included', 'no') == 'content':
files_to_delete.extend(destfilenames)
diff --git a/src/rougail/template/engine/cheetah.py b/src/rougail/template/engine/cheetah.py
index 508217029..9f75ff179 100644
--- a/src/rougail/template/engine/cheetah.py
+++ b/src/rougail/template/engine/cheetah.py
@@ -100,6 +100,7 @@ def process(filename: str,
index: int,
rougail_variables_dict: Dict,
eosfunc: Dict,
+ extra_variables: Any=None,
):
"""Process a cheetah template
"""
@@ -113,6 +114,8 @@ def process(filename: str,
extra_context['rougail_variable'] = variable
if index is not None:
extra_context['rougail_index'] = index
+ if extra_variables:
+ extra_context['extra_variables'] = extra_variables
cheetah_template = CheetahTemplate(filename,
source,
rougail_variables_dict,
diff --git a/src/rougail/template/engine/creole_legacy.py b/src/rougail/template/engine/creole_legacy.py
index 7d6652493..deccb6b18 100644
--- a/src/rougail/template/engine/creole_legacy.py
+++ b/src/rougail/template/engine/creole_legacy.py
@@ -124,6 +124,7 @@ def process(filename: str,
index: int,
rougail_variables_dict: Dict,
eosfunc: Dict,
+ extra_variables: Any=None,
):
"""Process a cheetah template
"""
@@ -139,6 +140,8 @@ def process(filename: str,
extra_context['rougail_variable'] = variable
if index is not None:
extra_context['rougail_index'] = index
+ if extra_variables:
+ extra_context['extra_variables'] = extra_variables
cheetah_template = CheetahTemplate(filename,
source,
rougail_variables_dict,
diff --git a/src/rougail/template/engine/jinja.py b/src/rougail/template/engine/jinja.py
index 5537dca57..9d56231ea 100644
--- a/src/rougail/template/engine/jinja.py
+++ b/src/rougail/template/engine/jinja.py
@@ -45,6 +45,7 @@ def process(filename: str,
index: int,
rougail_variables_dict: Dict,
eosfunc: Dict,
+ extra_variables: Any=None,
):
"""Process a cheetah template
"""
@@ -57,6 +58,8 @@ def process(filename: str,
var['rougail_variable'] = variable
if index is not None:
var['rougail_index'] = index
+ if extra_variables:
+ var['extra_variables'] = extra_variables
try:
# extra_context = {'normalize_family': normalize_family,
# eosfunc
diff --git a/src/rougail/tiramisureflector.py b/src/rougail/tiramisureflector.py
index 118bd9fd2..490543437 100644
--- a/src/rougail/tiramisureflector.py
+++ b/src/rougail/tiramisureflector.py
@@ -343,6 +343,8 @@ class Common:
param_type = 'ParamDynOption'
family = param.family.reflector_object.get(self.calls, self.elt.path, 'suffix')
params.extend([f"'{param.suffix}'", f'{family}'])
+ if param.optional:
+ params.append('optional=True')
else:
param_type = 'ParamOption'
if not param.propertyerror:
diff --git a/tests/dictionaries/01base_certificate/makedict/after.json b/tests/dictionaries/01base_certificate/makedict/after.json
deleted file mode 100644
index 034988e52..000000000
--- a/tests/dictionaries/01base_certificate/makedict/after.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
- "services.test_service.certificates./etc/pki/tls/certs/example_crt.authority": {
- "owner": "default",
- "value": "/etc/pki/ca-trust/source/anchors/ca_example.crt"
- },
- "services.test_service.certificates./etc/pki/tls/certs/example_crt.name": {
- "owner": "default",
- "value": "/etc/pki/tls/certs/example.crt"
- },
- "services.test_service.certificates./etc/pki/tls/certs/example_crt.private": {
- "owner": "default",
- "value": "/etc/pki/tls/private/example.key"
- },
- "services.test_service.certificates./etc/pki/tls/certs/example_crt.activate": {
- "owner": "default",
- "value": true
- },
- "services.test_service.activate": {
- "owner": "default",
- "value": true
- },
- "services.test_service.manage": {
- "owner": "default",
- "value": true
- }
-}
diff --git a/tests/dictionaries/01base_certificate/makedict/base.json b/tests/dictionaries/01base_certificate/makedict/base.json
deleted file mode 100644
index 3d1864ca5..000000000
--- a/tests/dictionaries/01base_certificate/makedict/base.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
- "services.test_service.certificates./etc/pki/tls/certs/example_crt.authority": "/etc/pki/ca-trust/source/anchors/ca_example.crt",
- "services.test_service.certificates./etc/pki/tls/certs/example_crt.name": "/etc/pki/tls/certs/example.crt",
- "services.test_service.certificates./etc/pki/tls/certs/example_crt.private": "/etc/pki/tls/private/example.key",
- "services.test_service.certificates./etc/pki/tls/certs/example_crt.activate": true,
- "services.test_service.activate": true,
- "services.test_service.manage": true
-}
diff --git a/tests/dictionaries/01base_certificate/makedict/before.json b/tests/dictionaries/01base_certificate/makedict/before.json
deleted file mode 100644
index 034988e52..000000000
--- a/tests/dictionaries/01base_certificate/makedict/before.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
- "services.test_service.certificates./etc/pki/tls/certs/example_crt.authority": {
- "owner": "default",
- "value": "/etc/pki/ca-trust/source/anchors/ca_example.crt"
- },
- "services.test_service.certificates./etc/pki/tls/certs/example_crt.name": {
- "owner": "default",
- "value": "/etc/pki/tls/certs/example.crt"
- },
- "services.test_service.certificates./etc/pki/tls/certs/example_crt.private": {
- "owner": "default",
- "value": "/etc/pki/tls/private/example.key"
- },
- "services.test_service.certificates./etc/pki/tls/certs/example_crt.activate": {
- "owner": "default",
- "value": true
- },
- "services.test_service.activate": {
- "owner": "default",
- "value": true
- },
- "services.test_service.manage": {
- "owner": "default",
- "value": true
- }
-}
diff --git a/tests/dictionaries/01base_certificate/tiramisu/base.py b/tests/dictionaries/01base_certificate/tiramisu/base.py
deleted file mode 100644
index 219477cad..000000000
--- a/tests/dictionaries/01base_certificate/tiramisu/base.py
+++ /dev/null
@@ -1,32 +0,0 @@
-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
-
-def _load_functions(path):
- global _SourceFileLoader, _spec_from_loader, _module_from_spec, func
- loader = _SourceFileLoader('func', path)
- 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))
-_load_functions('tests/dictionaries/../eosfunc/test.py')
-try:
- from tiramisu3 import *
-except:
- from tiramisu import *
-option_5 = FilenameOption(name="authority", doc="authority", default="/etc/pki/ca-trust/source/anchors/ca_example.crt")
-option_6 = FilenameOption(name="name", doc="name", default="/etc/pki/tls/certs/example.crt")
-option_7 = FilenameOption(name="private", doc="private", default="/etc/pki/tls/private/example.key")
-option_4 = BoolOption(name="activate", doc="activate", default=True)
-optiondescription_3 = OptionDescription(name="/etc/pki/tls/certs/example_crt", doc="/etc/pki/tls/certs/example.crt", children=[option_5, option_6, option_7, option_4])
-optiondescription_2 = OptionDescription(name="certificates", doc="certificates", children=[optiondescription_3])
-option_1 = BoolOption(name="activate", doc="activate", default=True)
-option_8 = BoolOption(name="manage", doc="manage", default=True)
-optiondescription_10 = OptionDescription(name="test_service", doc="test.service", children=[optiondescription_2, option_1, option_8])
-optiondescription_10.impl_set_information('type', "service")
-optiondescription_9 = OptionDescription(name="services", doc="services", children=[optiondescription_10], properties=frozenset({"hidden"}))
-option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_9])
diff --git a/tests/dictionaries/01base_certificate/tiramisu/multi.py b/tests/dictionaries/01base_certificate/tiramisu/multi.py
deleted file mode 100644
index 4bcd94783..000000000
--- a/tests/dictionaries/01base_certificate/tiramisu/multi.py
+++ /dev/null
@@ -1,45 +0,0 @@
-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
-
-def _load_functions(path):
- global _SourceFileLoader, _spec_from_loader, _module_from_spec, func
- loader = _SourceFileLoader('func', path)
- 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))
-_load_functions('tests/dictionaries/../eosfunc/test.py')
-try:
- from tiramisu3 import *
-except:
- from tiramisu import *
-option_5 = FilenameOption(name="authority", doc="authority", default="/etc/pki/ca-trust/source/anchors/ca_example.crt")
-option_6 = FilenameOption(name="name", doc="name", default="/etc/pki/tls/certs/example.crt")
-option_7 = FilenameOption(name="private", doc="private", default="/etc/pki/tls/private/example.key")
-option_4 = BoolOption(name="activate", doc="activate", default=True)
-optiondescription_3 = OptionDescription(name="/etc/pki/tls/certs/example_crt", doc="/etc/pki/tls/certs/example.crt", children=[option_5, option_6, option_7, option_4])
-optiondescription_2 = OptionDescription(name="certificates", doc="certificates", children=[optiondescription_3])
-option_1 = BoolOption(name="activate", doc="activate", default=True)
-option_8 = BoolOption(name="manage", doc="manage", default=True)
-optiondescription_19 = OptionDescription(name="test_service", doc="test.service", children=[optiondescription_2, option_1, option_8])
-optiondescription_19.impl_set_information('type', "service")
-optiondescription_18 = OptionDescription(name="services", doc="services", children=[optiondescription_19], properties=frozenset({"hidden"}))
-optiondescription_17 = OptionDescription(name="1", doc="1", children=[optiondescription_18])
-option_13 = FilenameOption(name="authority", doc="authority", default="/etc/pki/ca-trust/source/anchors/ca_example.crt")
-option_14 = FilenameOption(name="name", doc="name", default="/etc/pki/tls/certs/example.crt")
-option_15 = FilenameOption(name="private", doc="private", default="/etc/pki/tls/private/example.key")
-option_12 = BoolOption(name="activate", doc="activate", default=True)
-optiondescription_11 = OptionDescription(name="/etc/pki/tls/certs/example_crt", doc="/etc/pki/tls/certs/example.crt", children=[option_13, option_14, option_15, option_12])
-optiondescription_10 = OptionDescription(name="certificates", doc="certificates", children=[optiondescription_11])
-option_9 = BoolOption(name="activate", doc="activate", default=True)
-option_16 = BoolOption(name="manage", doc="manage", default=True)
-optiondescription_22 = OptionDescription(name="test_service", doc="test.service", children=[optiondescription_10, option_9, option_16])
-optiondescription_22.impl_set_information('type', "service")
-optiondescription_21 = OptionDescription(name="services", doc="services", children=[optiondescription_22], properties=frozenset({"hidden"}))
-optiondescription_20 = OptionDescription(name="2", doc="2", children=[optiondescription_21])
-option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_17, optiondescription_20])
diff --git a/tests/dictionaries/01base_certificate/xml/00-base.xml b/tests/dictionaries/01base_certificate/xml/00-base.xml
deleted file mode 100644
index 83db92cc7..000000000
--- a/tests/dictionaries/01base_certificate/xml/00-base.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
- /etc/pki/tls/certs/example.crt
-
-
-
diff --git a/tests/dictionaries/01base_certificate/yml/00-base.yml b/tests/dictionaries/01base_certificate/yml/00-base.yml
deleted file mode 100644
index e89f38387..000000000
--- a/tests/dictionaries/01base_certificate/yml/00-base.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-version: '0.10'
-services:
-- service:
- - name: test
- certificate:
- - private: /etc/pki/tls/private/example.key
- authority: /etc/pki/ca-trust/source/anchors/ca_example.crt
- text: /etc/pki/tls/certs/example.crt
diff --git a/tests/dictionaries/01base_certificate_group_variable_wrong/xml/00-base.xml b/tests/dictionaries/01base_certificate_group_variable_wrong/xml/00-base.xml
index 176b4508c..241c7aa2d 100644
--- a/tests/dictionaries/01base_certificate_group_variable_wrong/xml/00-base.xml
+++ b/tests/dictionaries/01base_certificate_group_variable_wrong/xml/00-base.xml
@@ -2,15 +2,27 @@
- /etc/pki/tls/certs/example.crt
+ certificate
+
+ /etc/pki/tls/certs/example.crt
+
+
+ /etc/pki/tls/private/example.key
+
+
+ /etc/pki/ca-trust/source/anchors/ca_example.crt
+
example
example
+
+ example.net
+
diff --git a/tests/dictionaries/01base_certificate_group_variable_wrong/yml/00-base.yml b/tests/dictionaries/01base_certificate_group_variable_wrong/yml/00-base.yml
index 68a8652f0..ca539e89d 100644
--- a/tests/dictionaries/01base_certificate_group_variable_wrong/yml/00-base.yml
+++ b/tests/dictionaries/01base_certificate_group_variable_wrong/yml/00-base.yml
@@ -3,15 +3,27 @@ services:
- service:
- name: test
certificate:
- - private: /etc/pki/tls/private/example.key
- authority: /etc/pki/ca-trust/source/anchors/ca_example.crt
+ - private: private
+ authority: authority
owner: owner
owner_type: variable
group: group
group_type: variable
- text: /etc/pki/tls/certs/example.crt
+ text: certificate
variables:
- variable:
+ - name: certificate
+ type: filename
+ value:
+ - text: /etc/pki/tls/certs/example.crt
+ - name: private
+ type: filename
+ value:
+ - text: /etc/pki/tls/private/example.key
+ - name: authority
+ type: filename
+ value:
+ - text: /etc/pki/ca-trust/source/anchors/ca_example.crt
- name: owner
type: unix_user
value:
@@ -19,3 +31,7 @@ variables:
- name: group
value:
- text: example
+ - name: server_name
+ type: domainname
+ value:
+ - text: example.net
diff --git a/tests/dictionaries/01base_certificate_owner/makedict/after.json b/tests/dictionaries/01base_certificate_owner/makedict/after.json
index c60a5df75..a898b5835 100644
--- a/tests/dictionaries/01base_certificate_owner/makedict/after.json
+++ b/tests/dictionaries/01base_certificate_owner/makedict/after.json
@@ -1,25 +1,45 @@
{
- "services.test_service.certificates./etc/pki/tls/certs/example_crt.authority": {
- "owner": "default",
- "value": "/etc/pki/ca-trust/source/anchors/ca_example.crt"
- },
- "services.test_service.certificates./etc/pki/tls/certs/example_crt.group": {
- "owner": "default",
- "value": "example"
- },
- "services.test_service.certificates./etc/pki/tls/certs/example_crt.name": {
+ "rougail.certificate": {
"owner": "default",
"value": "/etc/pki/tls/certs/example.crt"
},
- "services.test_service.certificates./etc/pki/tls/certs/example_crt.owner": {
- "owner": "default",
- "value": "example"
- },
- "services.test_service.certificates./etc/pki/tls/certs/example_crt.private": {
+ "rougail.private": {
"owner": "default",
"value": "/etc/pki/tls/private/example.key"
},
- "services.test_service.certificates./etc/pki/tls/certs/example_crt.activate": {
+ "rougail.authority": {
+ "owner": "default",
+ "value": "/etc/pki/ca-trust/source/anchors/ca_example.crt"
+ },
+ "rougail.server_name": {
+ "owner": "default",
+ "value": "example.net"
+ },
+ "services.test_service.certificates.certificate.authority": {
+ "owner": "default",
+ "value": "/etc/pki/ca-trust/source/anchors/ca_example.crt"
+ },
+ "services.test_service.certificates.certificate.domain": {
+ "owner": "default",
+ "value": "example.net"
+ },
+ "services.test_service.certificates.certificate.group": {
+ "owner": "default",
+ "value": "example"
+ },
+ "services.test_service.certificates.certificate.name": {
+ "owner": "default",
+ "value": "/etc/pki/tls/certs/example.crt"
+ },
+ "services.test_service.certificates.certificate.owner": {
+ "owner": "default",
+ "value": "example"
+ },
+ "services.test_service.certificates.certificate.private": {
+ "owner": "default",
+ "value": "/etc/pki/tls/private/example.key"
+ },
+ "services.test_service.certificates.certificate.activate": {
"owner": "default",
"value": true
},
diff --git a/tests/dictionaries/01base_certificate_owner/makedict/base.json b/tests/dictionaries/01base_certificate_owner/makedict/base.json
index bac2a7b7c..812cc8b69 100644
--- a/tests/dictionaries/01base_certificate_owner/makedict/base.json
+++ b/tests/dictionaries/01base_certificate_owner/makedict/base.json
@@ -1,10 +1,15 @@
{
- "services.test_service.certificates./etc/pki/tls/certs/example_crt.authority": "/etc/pki/ca-trust/source/anchors/ca_example.crt",
- "services.test_service.certificates./etc/pki/tls/certs/example_crt.group": "example",
- "services.test_service.certificates./etc/pki/tls/certs/example_crt.name": "/etc/pki/tls/certs/example.crt",
- "services.test_service.certificates./etc/pki/tls/certs/example_crt.owner": "example",
- "services.test_service.certificates./etc/pki/tls/certs/example_crt.private": "/etc/pki/tls/private/example.key",
- "services.test_service.certificates./etc/pki/tls/certs/example_crt.activate": true,
+ "rougail.certificate": "/etc/pki/tls/certs/example.crt",
+ "rougail.private": "/etc/pki/tls/private/example.key",
+ "rougail.authority": "/etc/pki/ca-trust/source/anchors/ca_example.crt",
+ "rougail.server_name": "example.net",
+ "services.test_service.certificates.certificate.authority": "/etc/pki/ca-trust/source/anchors/ca_example.crt",
+ "services.test_service.certificates.certificate.domain": "example.net",
+ "services.test_service.certificates.certificate.group": "example",
+ "services.test_service.certificates.certificate.name": "/etc/pki/tls/certs/example.crt",
+ "services.test_service.certificates.certificate.owner": "example",
+ "services.test_service.certificates.certificate.private": "/etc/pki/tls/private/example.key",
+ "services.test_service.certificates.certificate.activate": true,
"services.test_service.activate": true,
"services.test_service.manage": true
}
diff --git a/tests/dictionaries/01base_certificate_owner/makedict/before.json b/tests/dictionaries/01base_certificate_owner/makedict/before.json
index c60a5df75..a898b5835 100644
--- a/tests/dictionaries/01base_certificate_owner/makedict/before.json
+++ b/tests/dictionaries/01base_certificate_owner/makedict/before.json
@@ -1,25 +1,45 @@
{
- "services.test_service.certificates./etc/pki/tls/certs/example_crt.authority": {
- "owner": "default",
- "value": "/etc/pki/ca-trust/source/anchors/ca_example.crt"
- },
- "services.test_service.certificates./etc/pki/tls/certs/example_crt.group": {
- "owner": "default",
- "value": "example"
- },
- "services.test_service.certificates./etc/pki/tls/certs/example_crt.name": {
+ "rougail.certificate": {
"owner": "default",
"value": "/etc/pki/tls/certs/example.crt"
},
- "services.test_service.certificates./etc/pki/tls/certs/example_crt.owner": {
- "owner": "default",
- "value": "example"
- },
- "services.test_service.certificates./etc/pki/tls/certs/example_crt.private": {
+ "rougail.private": {
"owner": "default",
"value": "/etc/pki/tls/private/example.key"
},
- "services.test_service.certificates./etc/pki/tls/certs/example_crt.activate": {
+ "rougail.authority": {
+ "owner": "default",
+ "value": "/etc/pki/ca-trust/source/anchors/ca_example.crt"
+ },
+ "rougail.server_name": {
+ "owner": "default",
+ "value": "example.net"
+ },
+ "services.test_service.certificates.certificate.authority": {
+ "owner": "default",
+ "value": "/etc/pki/ca-trust/source/anchors/ca_example.crt"
+ },
+ "services.test_service.certificates.certificate.domain": {
+ "owner": "default",
+ "value": "example.net"
+ },
+ "services.test_service.certificates.certificate.group": {
+ "owner": "default",
+ "value": "example"
+ },
+ "services.test_service.certificates.certificate.name": {
+ "owner": "default",
+ "value": "/etc/pki/tls/certs/example.crt"
+ },
+ "services.test_service.certificates.certificate.owner": {
+ "owner": "default",
+ "value": "example"
+ },
+ "services.test_service.certificates.certificate.private": {
+ "owner": "default",
+ "value": "/etc/pki/tls/private/example.key"
+ },
+ "services.test_service.certificates.certificate.activate": {
"owner": "default",
"value": true
},
diff --git a/tests/dictionaries/01base_certificate_owner/tiramisu/base.py b/tests/dictionaries/01base_certificate_owner/tiramisu/base.py
index e77bfc8ad..eec3bb303 100644
--- a/tests/dictionaries/01base_certificate_owner/tiramisu/base.py
+++ b/tests/dictionaries/01base_certificate_owner/tiramisu/base.py
@@ -18,17 +18,24 @@ try:
from tiramisu3 import *
except:
from tiramisu import *
-option_5 = FilenameOption(name="authority", doc="authority", default="/etc/pki/ca-trust/source/anchors/ca_example.crt")
-option_6 = UsernameOption(name="group", doc="group", default="example")
-option_7 = FilenameOption(name="name", doc="name", default="/etc/pki/tls/certs/example.crt")
-option_8 = UsernameOption(name="owner", doc="owner", default="example")
-option_9 = FilenameOption(name="private", doc="private", default="/etc/pki/tls/private/example.key")
-option_4 = BoolOption(name="activate", doc="activate", default=True)
-optiondescription_3 = OptionDescription(name="/etc/pki/tls/certs/example_crt", doc="/etc/pki/tls/certs/example.crt", children=[option_5, option_6, option_7, option_8, option_9, option_4])
-optiondescription_2 = OptionDescription(name="certificates", doc="certificates", children=[optiondescription_3])
-option_1 = BoolOption(name="activate", doc="activate", default=True)
-option_10 = BoolOption(name="manage", doc="manage", default=True)
-optiondescription_12 = OptionDescription(name="test_service", doc="test.service", children=[optiondescription_2, option_1, option_10])
-optiondescription_12.impl_set_information('type', "service")
-optiondescription_11 = OptionDescription(name="services", doc="services", children=[optiondescription_12], properties=frozenset({"hidden"}))
-option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_11])
+option_1 = FilenameOption(name="certificate", doc="certificate", default="/etc/pki/tls/certs/example.crt", properties=frozenset({"mandatory", "normal"}))
+option_2 = FilenameOption(name="private", doc="private", default="/etc/pki/tls/private/example.key", properties=frozenset({"mandatory", "normal"}))
+option_3 = FilenameOption(name="authority", doc="authority", default="/etc/pki/ca-trust/source/anchors/ca_example.crt", properties=frozenset({"mandatory", "normal"}))
+option_4 = DomainnameOption(name="server_name", doc="server_name", default="example.net", type='domainname', allow_ip=False, properties=frozenset({"mandatory", "normal"}))
+optiondescription_16 = OptionDescription(name="rougail", doc="Rougail", children=[option_1, option_2, option_3, option_4])
+option_9 = SymLinkOption(name="authority", opt=option_3)
+option_10 = SymLinkOption(name="domain", opt=option_4)
+option_11 = UsernameOption(name="group", doc="group", default="example")
+option_12 = SymLinkOption(name="name", opt=option_1)
+option_13 = UsernameOption(name="owner", doc="owner", default="example")
+option_14 = SymLinkOption(name="private", opt=option_2)
+option_8 = BoolOption(name="activate", doc="activate", default=True)
+optiondescription_7 = OptionDescription(name="certificate", doc="certificate", children=[option_9, option_10, option_11, option_12, option_13, option_14, option_8])
+optiondescription_7.impl_set_information('type', "client")
+optiondescription_6 = OptionDescription(name="certificates", doc="certificates", children=[optiondescription_7])
+option_5 = BoolOption(name="activate", doc="activate", default=True)
+option_15 = BoolOption(name="manage", doc="manage", default=True)
+optiondescription_18 = OptionDescription(name="test_service", doc="test.service", children=[optiondescription_6, option_5, option_15])
+optiondescription_18.impl_set_information('type', "service")
+optiondescription_17 = OptionDescription(name="services", doc="services", children=[optiondescription_18], properties=frozenset({"hidden"}))
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_16, optiondescription_17])
diff --git a/tests/dictionaries/01base_certificate_owner/tiramisu/multi.py b/tests/dictionaries/01base_certificate_owner/tiramisu/multi.py
index a1bc010f0..496def0a8 100644
--- a/tests/dictionaries/01base_certificate_owner/tiramisu/multi.py
+++ b/tests/dictionaries/01base_certificate_owner/tiramisu/multi.py
@@ -18,32 +18,46 @@ try:
from tiramisu3 import *
except:
from tiramisu import *
-option_5 = FilenameOption(name="authority", doc="authority", default="/etc/pki/ca-trust/source/anchors/ca_example.crt")
-option_6 = UsernameOption(name="group", doc="group", default="example")
-option_7 = FilenameOption(name="name", doc="name", default="/etc/pki/tls/certs/example.crt")
-option_8 = UsernameOption(name="owner", doc="owner", default="example")
-option_9 = FilenameOption(name="private", doc="private", default="/etc/pki/tls/private/example.key")
-option_4 = BoolOption(name="activate", doc="activate", default=True)
-optiondescription_3 = OptionDescription(name="/etc/pki/tls/certs/example_crt", doc="/etc/pki/tls/certs/example.crt", children=[option_5, option_6, option_7, option_8, option_9, option_4])
-optiondescription_2 = OptionDescription(name="certificates", doc="certificates", children=[optiondescription_3])
-option_1 = BoolOption(name="activate", doc="activate", default=True)
-option_10 = BoolOption(name="manage", doc="manage", default=True)
-optiondescription_23 = OptionDescription(name="test_service", doc="test.service", children=[optiondescription_2, option_1, option_10])
-optiondescription_23.impl_set_information('type', "service")
-optiondescription_22 = OptionDescription(name="services", doc="services", children=[optiondescription_23], properties=frozenset({"hidden"}))
-optiondescription_21 = OptionDescription(name="1", doc="1", children=[optiondescription_22])
-option_15 = FilenameOption(name="authority", doc="authority", default="/etc/pki/ca-trust/source/anchors/ca_example.crt")
-option_16 = UsernameOption(name="group", doc="group", default="example")
-option_17 = FilenameOption(name="name", doc="name", default="/etc/pki/tls/certs/example.crt")
-option_18 = UsernameOption(name="owner", doc="owner", default="example")
-option_19 = FilenameOption(name="private", doc="private", default="/etc/pki/tls/private/example.key")
-option_14 = BoolOption(name="activate", doc="activate", default=True)
-optiondescription_13 = OptionDescription(name="/etc/pki/tls/certs/example_crt", doc="/etc/pki/tls/certs/example.crt", children=[option_15, option_16, option_17, option_18, option_19, option_14])
-optiondescription_12 = OptionDescription(name="certificates", doc="certificates", children=[optiondescription_13])
-option_11 = BoolOption(name="activate", doc="activate", default=True)
-option_20 = BoolOption(name="manage", doc="manage", default=True)
-optiondescription_26 = OptionDescription(name="test_service", doc="test.service", children=[optiondescription_12, option_11, option_20])
-optiondescription_26.impl_set_information('type', "service")
-optiondescription_25 = OptionDescription(name="services", doc="services", children=[optiondescription_26], properties=frozenset({"hidden"}))
-optiondescription_24 = OptionDescription(name="2", doc="2", children=[optiondescription_25])
-option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_21, optiondescription_24])
+option_1 = FilenameOption(name="certificate", doc="certificate", default="/etc/pki/tls/certs/example.crt", properties=frozenset({"mandatory", "normal"}))
+option_2 = FilenameOption(name="private", doc="private", default="/etc/pki/tls/private/example.key", properties=frozenset({"mandatory", "normal"}))
+option_3 = FilenameOption(name="authority", doc="authority", default="/etc/pki/ca-trust/source/anchors/ca_example.crt", properties=frozenset({"mandatory", "normal"}))
+option_4 = DomainnameOption(name="server_name", doc="server_name", default="example.net", type='domainname', allow_ip=False, properties=frozenset({"mandatory", "normal"}))
+optiondescription_32 = OptionDescription(name="rougail", doc="Rougail", children=[option_1, option_2, option_3, option_4])
+option_13 = SymLinkOption(name="authority", opt=option_3)
+option_14 = SymLinkOption(name="domain", opt=option_4)
+option_15 = UsernameOption(name="group", doc="group", default="example")
+option_16 = SymLinkOption(name="name", opt=option_1)
+option_17 = UsernameOption(name="owner", doc="owner", default="example")
+option_18 = SymLinkOption(name="private", opt=option_2)
+option_12 = BoolOption(name="activate", doc="activate", default=True)
+optiondescription_11 = OptionDescription(name="certificate", doc="certificate", children=[option_13, option_14, option_15, option_16, option_17, option_18, option_12])
+optiondescription_11.impl_set_information('type', "client")
+optiondescription_10 = OptionDescription(name="certificates", doc="certificates", children=[optiondescription_11])
+option_9 = BoolOption(name="activate", doc="activate", default=True)
+option_19 = BoolOption(name="manage", doc="manage", default=True)
+optiondescription_34 = OptionDescription(name="test_service", doc="test.service", children=[optiondescription_10, option_9, option_19])
+optiondescription_34.impl_set_information('type', "service")
+optiondescription_33 = OptionDescription(name="services", doc="services", children=[optiondescription_34], properties=frozenset({"hidden"}))
+optiondescription_31 = OptionDescription(name="1", doc="1", children=[optiondescription_32, optiondescription_33])
+option_5 = FilenameOption(name="certificate", doc="certificate", default="/etc/pki/tls/certs/example.crt", properties=frozenset({"mandatory", "normal"}))
+option_6 = FilenameOption(name="private", doc="private", default="/etc/pki/tls/private/example.key", properties=frozenset({"mandatory", "normal"}))
+option_7 = FilenameOption(name="authority", doc="authority", default="/etc/pki/ca-trust/source/anchors/ca_example.crt", properties=frozenset({"mandatory", "normal"}))
+option_8 = DomainnameOption(name="server_name", doc="server_name", default="example.net", type='domainname', allow_ip=False, properties=frozenset({"mandatory", "normal"}))
+optiondescription_36 = OptionDescription(name="rougail", doc="Rougail", children=[option_5, option_6, option_7, option_8])
+option_24 = SymLinkOption(name="authority", opt=option_7)
+option_25 = SymLinkOption(name="domain", opt=option_8)
+option_26 = UsernameOption(name="group", doc="group", default="example")
+option_27 = SymLinkOption(name="name", opt=option_5)
+option_28 = UsernameOption(name="owner", doc="owner", default="example")
+option_29 = SymLinkOption(name="private", opt=option_6)
+option_23 = BoolOption(name="activate", doc="activate", default=True)
+optiondescription_22 = OptionDescription(name="certificate", doc="certificate", children=[option_24, option_25, option_26, option_27, option_28, option_29, option_23])
+optiondescription_22.impl_set_information('type', "client")
+optiondescription_21 = OptionDescription(name="certificates", doc="certificates", children=[optiondescription_22])
+option_20 = BoolOption(name="activate", doc="activate", default=True)
+option_30 = BoolOption(name="manage", doc="manage", default=True)
+optiondescription_38 = OptionDescription(name="test_service", doc="test.service", children=[optiondescription_21, option_20, option_30])
+optiondescription_38.impl_set_information('type', "service")
+optiondescription_37 = OptionDescription(name="services", doc="services", children=[optiondescription_38], properties=frozenset({"hidden"}))
+optiondescription_35 = OptionDescription(name="2", doc="2", children=[optiondescription_36, optiondescription_37])
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_31, optiondescription_35])
diff --git a/tests/dictionaries/01base_certificate_owner/xml/00-base.xml b/tests/dictionaries/01base_certificate_owner/xml/00-base.xml
index 979e5463b..69b755f08 100644
--- a/tests/dictionaries/01base_certificate_owner/xml/00-base.xml
+++ b/tests/dictionaries/01base_certificate_owner/xml/00-base.xml
@@ -2,7 +2,21 @@
- /etc/pki/tls/certs/example.crt
+ certificate
+
+
+ /etc/pki/tls/certs/example.crt
+
+
+ /etc/pki/tls/private/example.key
+
+
+ /etc/pki/ca-trust/source/anchors/ca_example.crt
+
+
+ example.net
+
+
diff --git a/tests/dictionaries/01base_certificate_owner/yml/00-base.yml b/tests/dictionaries/01base_certificate_owner/yml/00-base.yml
index 0dee3a4c4..6042a6992 100644
--- a/tests/dictionaries/01base_certificate_owner/yml/00-base.yml
+++ b/tests/dictionaries/01base_certificate_owner/yml/00-base.yml
@@ -3,8 +3,26 @@ services:
- service:
- name: test
certificate:
- - private: /etc/pki/tls/private/example.key
- authority: /etc/pki/ca-trust/source/anchors/ca_example.crt
+ - private: private
+ authority: authority
owner: example
group: example
- text: /etc/pki/tls/certs/example.crt
+ text: certificate
+variables:
+- variable:
+ - name: certificate
+ type: filename
+ value:
+ - text: /etc/pki/tls/certs/example.crt
+ - name: private
+ type: filename
+ value:
+ - text: /etc/pki/tls/private/example.key
+ - name: authority
+ type: filename
+ value:
+ - text: /etc/pki/ca-trust/source/anchors/ca_example.crt
+ - name: server_name
+ type: domainname
+ value:
+ - text: example.net
diff --git a/tests/dictionaries/01base_certificate_owner_variable/makedict/after.json b/tests/dictionaries/01base_certificate_owner_variable/makedict/after.json
index ab27ebd51..92f6e538d 100644
--- a/tests/dictionaries/01base_certificate_owner_variable/makedict/after.json
+++ b/tests/dictionaries/01base_certificate_owner_variable/makedict/after.json
@@ -1,4 +1,16 @@
{
+ "rougail.certificate": {
+ "owner": "default",
+ "value": "/etc/pki/tls/certs/example.crt"
+ },
+ "rougail.private": {
+ "owner": "default",
+ "value": "/etc/pki/tls/private/example.key"
+ },
+ "rougail.authority": {
+ "owner": "default",
+ "value": "/etc/pki/ca-trust/source/anchors/ca_example.crt"
+ },
"rougail.owner": {
"owner": "default",
"value": "example"
@@ -7,27 +19,35 @@
"owner": "default",
"value": "example"
},
- "services.test_service.certificates./etc/pki/tls/certs/example_crt.authority": {
+ "rougail.server_name": {
+ "owner": "default",
+ "value": "example.net"
+ },
+ "services.test_service.certificates.certificate.authority": {
"owner": "default",
"value": "/etc/pki/ca-trust/source/anchors/ca_example.crt"
},
- "services.test_service.certificates./etc/pki/tls/certs/example_crt.group": {
+ "services.test_service.certificates.certificate.domain": {
+ "owner": "default",
+ "value": "example.net"
+ },
+ "services.test_service.certificates.certificate.group": {
"owner": "default",
"value": "example"
},
- "services.test_service.certificates./etc/pki/tls/certs/example_crt.name": {
+ "services.test_service.certificates.certificate.name": {
"owner": "default",
"value": "/etc/pki/tls/certs/example.crt"
},
- "services.test_service.certificates./etc/pki/tls/certs/example_crt.owner": {
+ "services.test_service.certificates.certificate.owner": {
"owner": "default",
"value": "example"
},
- "services.test_service.certificates./etc/pki/tls/certs/example_crt.private": {
+ "services.test_service.certificates.certificate.private": {
"owner": "default",
"value": "/etc/pki/tls/private/example.key"
},
- "services.test_service.certificates./etc/pki/tls/certs/example_crt.activate": {
+ "services.test_service.certificates.certificate.activate": {
"owner": "default",
"value": true
},
diff --git a/tests/dictionaries/01base_certificate_owner_variable/makedict/base.json b/tests/dictionaries/01base_certificate_owner_variable/makedict/base.json
index cf539a159..9654c4651 100644
--- a/tests/dictionaries/01base_certificate_owner_variable/makedict/base.json
+++ b/tests/dictionaries/01base_certificate_owner_variable/makedict/base.json
@@ -1,12 +1,17 @@
{
+ "rougail.certificate": "/etc/pki/tls/certs/example.crt",
+ "rougail.private": "/etc/pki/tls/private/example.key",
+ "rougail.authority": "/etc/pki/ca-trust/source/anchors/ca_example.crt",
"rougail.owner": "example",
"rougail.group": "example",
- "services.test_service.certificates./etc/pki/tls/certs/example_crt.authority": "/etc/pki/ca-trust/source/anchors/ca_example.crt",
- "services.test_service.certificates./etc/pki/tls/certs/example_crt.group": "example",
- "services.test_service.certificates./etc/pki/tls/certs/example_crt.name": "/etc/pki/tls/certs/example.crt",
- "services.test_service.certificates./etc/pki/tls/certs/example_crt.owner": "example",
- "services.test_service.certificates./etc/pki/tls/certs/example_crt.private": "/etc/pki/tls/private/example.key",
- "services.test_service.certificates./etc/pki/tls/certs/example_crt.activate": true,
+ "rougail.server_name": "example.net",
+ "services.test_service.certificates.certificate.authority": "/etc/pki/ca-trust/source/anchors/ca_example.crt",
+ "services.test_service.certificates.certificate.domain": "example.net",
+ "services.test_service.certificates.certificate.group": "example",
+ "services.test_service.certificates.certificate.name": "/etc/pki/tls/certs/example.crt",
+ "services.test_service.certificates.certificate.owner": "example",
+ "services.test_service.certificates.certificate.private": "/etc/pki/tls/private/example.key",
+ "services.test_service.certificates.certificate.activate": true,
"services.test_service.activate": true,
"services.test_service.manage": true
}
diff --git a/tests/dictionaries/01base_certificate_owner_variable/makedict/before.json b/tests/dictionaries/01base_certificate_owner_variable/makedict/before.json
index ab27ebd51..92f6e538d 100644
--- a/tests/dictionaries/01base_certificate_owner_variable/makedict/before.json
+++ b/tests/dictionaries/01base_certificate_owner_variable/makedict/before.json
@@ -1,4 +1,16 @@
{
+ "rougail.certificate": {
+ "owner": "default",
+ "value": "/etc/pki/tls/certs/example.crt"
+ },
+ "rougail.private": {
+ "owner": "default",
+ "value": "/etc/pki/tls/private/example.key"
+ },
+ "rougail.authority": {
+ "owner": "default",
+ "value": "/etc/pki/ca-trust/source/anchors/ca_example.crt"
+ },
"rougail.owner": {
"owner": "default",
"value": "example"
@@ -7,27 +19,35 @@
"owner": "default",
"value": "example"
},
- "services.test_service.certificates./etc/pki/tls/certs/example_crt.authority": {
+ "rougail.server_name": {
+ "owner": "default",
+ "value": "example.net"
+ },
+ "services.test_service.certificates.certificate.authority": {
"owner": "default",
"value": "/etc/pki/ca-trust/source/anchors/ca_example.crt"
},
- "services.test_service.certificates./etc/pki/tls/certs/example_crt.group": {
+ "services.test_service.certificates.certificate.domain": {
+ "owner": "default",
+ "value": "example.net"
+ },
+ "services.test_service.certificates.certificate.group": {
"owner": "default",
"value": "example"
},
- "services.test_service.certificates./etc/pki/tls/certs/example_crt.name": {
+ "services.test_service.certificates.certificate.name": {
"owner": "default",
"value": "/etc/pki/tls/certs/example.crt"
},
- "services.test_service.certificates./etc/pki/tls/certs/example_crt.owner": {
+ "services.test_service.certificates.certificate.owner": {
"owner": "default",
"value": "example"
},
- "services.test_service.certificates./etc/pki/tls/certs/example_crt.private": {
+ "services.test_service.certificates.certificate.private": {
"owner": "default",
"value": "/etc/pki/tls/private/example.key"
},
- "services.test_service.certificates./etc/pki/tls/certs/example_crt.activate": {
+ "services.test_service.certificates.certificate.activate": {
"owner": "default",
"value": true
},
diff --git a/tests/dictionaries/01base_certificate_owner_variable/tiramisu/base.py b/tests/dictionaries/01base_certificate_owner_variable/tiramisu/base.py
index 2bd4fddaf..afe5ba089 100644
--- a/tests/dictionaries/01base_certificate_owner_variable/tiramisu/base.py
+++ b/tests/dictionaries/01base_certificate_owner_variable/tiramisu/base.py
@@ -18,20 +18,26 @@ try:
from tiramisu3 import *
except:
from tiramisu import *
-option_1 = UsernameOption(name="owner", doc="owner", default="example", properties=frozenset({"mandatory", "normal"}))
-option_2 = UsernameOption(name="group", doc="group", default="example", properties=frozenset({"mandatory", "normal"}))
-optiondescription_13 = OptionDescription(name="rougail", doc="Rougail", children=[option_1, option_2])
-option_7 = FilenameOption(name="authority", doc="authority", default="/etc/pki/ca-trust/source/anchors/ca_example.crt")
-option_8 = SymLinkOption(name="group", opt=option_2)
-option_9 = FilenameOption(name="name", doc="name", default="/etc/pki/tls/certs/example.crt")
-option_10 = SymLinkOption(name="owner", opt=option_1)
-option_11 = FilenameOption(name="private", doc="private", default="/etc/pki/tls/private/example.key")
-option_6 = BoolOption(name="activate", doc="activate", default=True)
-optiondescription_5 = OptionDescription(name="/etc/pki/tls/certs/example_crt", doc="/etc/pki/tls/certs/example.crt", children=[option_7, option_8, option_9, option_10, option_11, option_6])
-optiondescription_4 = OptionDescription(name="certificates", doc="certificates", children=[optiondescription_5])
-option_3 = BoolOption(name="activate", doc="activate", default=True)
-option_12 = BoolOption(name="manage", doc="manage", default=True)
-optiondescription_15 = OptionDescription(name="test_service", doc="test.service", children=[optiondescription_4, option_3, option_12])
-optiondescription_15.impl_set_information('type', "service")
-optiondescription_14 = OptionDescription(name="services", doc="services", children=[optiondescription_15], properties=frozenset({"hidden"}))
-option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_13, optiondescription_14])
+option_1 = FilenameOption(name="certificate", doc="certificate", default="/etc/pki/tls/certs/example.crt", properties=frozenset({"mandatory", "normal"}))
+option_2 = FilenameOption(name="private", doc="private", default="/etc/pki/tls/private/example.key", properties=frozenset({"mandatory", "normal"}))
+option_3 = FilenameOption(name="authority", doc="authority", default="/etc/pki/ca-trust/source/anchors/ca_example.crt", properties=frozenset({"mandatory", "normal"}))
+option_4 = UsernameOption(name="owner", doc="owner", default="example", properties=frozenset({"mandatory", "normal"}))
+option_5 = UsernameOption(name="group", doc="group", default="example", properties=frozenset({"mandatory", "normal"}))
+option_6 = DomainnameOption(name="server_name", doc="server_name", default="example.net", type='domainname', allow_ip=False, properties=frozenset({"mandatory", "normal"}))
+optiondescription_18 = OptionDescription(name="rougail", doc="Rougail", children=[option_1, option_2, option_3, option_4, option_5, option_6])
+option_11 = SymLinkOption(name="authority", opt=option_3)
+option_12 = SymLinkOption(name="domain", opt=option_6)
+option_13 = SymLinkOption(name="group", opt=option_5)
+option_14 = SymLinkOption(name="name", opt=option_1)
+option_15 = SymLinkOption(name="owner", opt=option_4)
+option_16 = SymLinkOption(name="private", opt=option_2)
+option_10 = BoolOption(name="activate", doc="activate", default=True)
+optiondescription_9 = OptionDescription(name="certificate", doc="certificate", children=[option_11, option_12, option_13, option_14, option_15, option_16, option_10])
+optiondescription_9.impl_set_information('type', "client")
+optiondescription_8 = OptionDescription(name="certificates", doc="certificates", children=[optiondescription_9])
+option_7 = BoolOption(name="activate", doc="activate", default=True)
+option_17 = BoolOption(name="manage", doc="manage", default=True)
+optiondescription_20 = OptionDescription(name="test_service", doc="test.service", children=[optiondescription_8, option_7, option_17])
+optiondescription_20.impl_set_information('type', "service")
+optiondescription_19 = OptionDescription(name="services", doc="services", children=[optiondescription_20], properties=frozenset({"hidden"}))
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_18, optiondescription_19])
diff --git a/tests/dictionaries/01base_certificate_owner_variable/tiramisu/multi.py b/tests/dictionaries/01base_certificate_owner_variable/tiramisu/multi.py
index 94725228d..1244226ee 100644
--- a/tests/dictionaries/01base_certificate_owner_variable/tiramisu/multi.py
+++ b/tests/dictionaries/01base_certificate_owner_variable/tiramisu/multi.py
@@ -18,38 +18,50 @@ try:
from tiramisu3 import *
except:
from tiramisu import *
-option_1 = UsernameOption(name="owner", doc="owner", default="example", properties=frozenset({"mandatory", "normal"}))
-option_2 = UsernameOption(name="group", doc="group", default="example", properties=frozenset({"mandatory", "normal"}))
-optiondescription_26 = OptionDescription(name="rougail", doc="Rougail", children=[option_1, option_2])
-option_9 = FilenameOption(name="authority", doc="authority", default="/etc/pki/ca-trust/source/anchors/ca_example.crt")
-option_10 = SymLinkOption(name="group", opt=option_2)
-option_11 = FilenameOption(name="name", doc="name", default="/etc/pki/tls/certs/example.crt")
-option_12 = SymLinkOption(name="owner", opt=option_1)
-option_13 = FilenameOption(name="private", doc="private", default="/etc/pki/tls/private/example.key")
-option_8 = BoolOption(name="activate", doc="activate", default=True)
-optiondescription_7 = OptionDescription(name="/etc/pki/tls/certs/example_crt", doc="/etc/pki/tls/certs/example.crt", children=[option_9, option_10, option_11, option_12, option_13, option_8])
-optiondescription_6 = OptionDescription(name="certificates", doc="certificates", children=[optiondescription_7])
-option_5 = BoolOption(name="activate", doc="activate", default=True)
-option_14 = BoolOption(name="manage", doc="manage", default=True)
-optiondescription_28 = OptionDescription(name="test_service", doc="test.service", children=[optiondescription_6, option_5, option_14])
-optiondescription_28.impl_set_information('type', "service")
-optiondescription_27 = OptionDescription(name="services", doc="services", children=[optiondescription_28], properties=frozenset({"hidden"}))
-optiondescription_25 = OptionDescription(name="1", doc="1", children=[optiondescription_26, optiondescription_27])
-option_3 = UsernameOption(name="owner", doc="owner", default="example", properties=frozenset({"mandatory", "normal"}))
-option_4 = UsernameOption(name="group", doc="group", default="example", properties=frozenset({"mandatory", "normal"}))
-optiondescription_30 = OptionDescription(name="rougail", doc="Rougail", children=[option_3, option_4])
-option_19 = FilenameOption(name="authority", doc="authority", default="/etc/pki/ca-trust/source/anchors/ca_example.crt")
-option_20 = SymLinkOption(name="group", opt=option_4)
-option_21 = FilenameOption(name="name", doc="name", default="/etc/pki/tls/certs/example.crt")
-option_22 = SymLinkOption(name="owner", opt=option_3)
-option_23 = FilenameOption(name="private", doc="private", default="/etc/pki/tls/private/example.key")
-option_18 = BoolOption(name="activate", doc="activate", default=True)
-optiondescription_17 = OptionDescription(name="/etc/pki/tls/certs/example_crt", doc="/etc/pki/tls/certs/example.crt", children=[option_19, option_20, option_21, option_22, option_23, option_18])
-optiondescription_16 = OptionDescription(name="certificates", doc="certificates", children=[optiondescription_17])
-option_15 = BoolOption(name="activate", doc="activate", default=True)
-option_24 = BoolOption(name="manage", doc="manage", default=True)
-optiondescription_32 = OptionDescription(name="test_service", doc="test.service", children=[optiondescription_16, option_15, option_24])
-optiondescription_32.impl_set_information('type', "service")
-optiondescription_31 = OptionDescription(name="services", doc="services", children=[optiondescription_32], properties=frozenset({"hidden"}))
-optiondescription_29 = OptionDescription(name="2", doc="2", children=[optiondescription_30, optiondescription_31])
-option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_25, optiondescription_29])
+option_1 = FilenameOption(name="certificate", doc="certificate", default="/etc/pki/tls/certs/example.crt", properties=frozenset({"mandatory", "normal"}))
+option_2 = FilenameOption(name="private", doc="private", default="/etc/pki/tls/private/example.key", properties=frozenset({"mandatory", "normal"}))
+option_3 = FilenameOption(name="authority", doc="authority", default="/etc/pki/ca-trust/source/anchors/ca_example.crt", properties=frozenset({"mandatory", "normal"}))
+option_4 = UsernameOption(name="owner", doc="owner", default="example", properties=frozenset({"mandatory", "normal"}))
+option_5 = UsernameOption(name="group", doc="group", default="example", properties=frozenset({"mandatory", "normal"}))
+option_6 = DomainnameOption(name="server_name", doc="server_name", default="example.net", type='domainname', allow_ip=False, properties=frozenset({"mandatory", "normal"}))
+optiondescription_36 = OptionDescription(name="rougail", doc="Rougail", children=[option_1, option_2, option_3, option_4, option_5, option_6])
+option_17 = SymLinkOption(name="authority", opt=option_3)
+option_18 = SymLinkOption(name="domain", opt=option_6)
+option_19 = SymLinkOption(name="group", opt=option_5)
+option_20 = SymLinkOption(name="name", opt=option_1)
+option_21 = SymLinkOption(name="owner", opt=option_4)
+option_22 = SymLinkOption(name="private", opt=option_2)
+option_16 = BoolOption(name="activate", doc="activate", default=True)
+optiondescription_15 = OptionDescription(name="certificate", doc="certificate", children=[option_17, option_18, option_19, option_20, option_21, option_22, option_16])
+optiondescription_15.impl_set_information('type', "client")
+optiondescription_14 = OptionDescription(name="certificates", doc="certificates", children=[optiondescription_15])
+option_13 = BoolOption(name="activate", doc="activate", default=True)
+option_23 = BoolOption(name="manage", doc="manage", default=True)
+optiondescription_38 = OptionDescription(name="test_service", doc="test.service", children=[optiondescription_14, option_13, option_23])
+optiondescription_38.impl_set_information('type', "service")
+optiondescription_37 = OptionDescription(name="services", doc="services", children=[optiondescription_38], properties=frozenset({"hidden"}))
+optiondescription_35 = OptionDescription(name="1", doc="1", children=[optiondescription_36, optiondescription_37])
+option_7 = FilenameOption(name="certificate", doc="certificate", default="/etc/pki/tls/certs/example.crt", properties=frozenset({"mandatory", "normal"}))
+option_8 = FilenameOption(name="private", doc="private", default="/etc/pki/tls/private/example.key", properties=frozenset({"mandatory", "normal"}))
+option_9 = FilenameOption(name="authority", doc="authority", default="/etc/pki/ca-trust/source/anchors/ca_example.crt", properties=frozenset({"mandatory", "normal"}))
+option_10 = UsernameOption(name="owner", doc="owner", default="example", properties=frozenset({"mandatory", "normal"}))
+option_11 = UsernameOption(name="group", doc="group", default="example", properties=frozenset({"mandatory", "normal"}))
+option_12 = DomainnameOption(name="server_name", doc="server_name", default="example.net", type='domainname', allow_ip=False, properties=frozenset({"mandatory", "normal"}))
+optiondescription_40 = OptionDescription(name="rougail", doc="Rougail", children=[option_7, option_8, option_9, option_10, option_11, option_12])
+option_28 = SymLinkOption(name="authority", opt=option_9)
+option_29 = SymLinkOption(name="domain", opt=option_12)
+option_30 = SymLinkOption(name="group", opt=option_11)
+option_31 = SymLinkOption(name="name", opt=option_7)
+option_32 = SymLinkOption(name="owner", opt=option_10)
+option_33 = SymLinkOption(name="private", opt=option_8)
+option_27 = BoolOption(name="activate", doc="activate", default=True)
+optiondescription_26 = OptionDescription(name="certificate", doc="certificate", children=[option_28, option_29, option_30, option_31, option_32, option_33, option_27])
+optiondescription_26.impl_set_information('type', "client")
+optiondescription_25 = OptionDescription(name="certificates", doc="certificates", children=[optiondescription_26])
+option_24 = BoolOption(name="activate", doc="activate", default=True)
+option_34 = BoolOption(name="manage", doc="manage", default=True)
+optiondescription_42 = OptionDescription(name="test_service", doc="test.service", children=[optiondescription_25, option_24, option_34])
+optiondescription_42.impl_set_information('type', "service")
+optiondescription_41 = OptionDescription(name="services", doc="services", children=[optiondescription_42], properties=frozenset({"hidden"}))
+optiondescription_39 = OptionDescription(name="2", doc="2", children=[optiondescription_40, optiondescription_41])
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_35, optiondescription_39])
diff --git a/tests/dictionaries/01base_certificate_owner_variable/xml/00-base.xml b/tests/dictionaries/01base_certificate_owner_variable/xml/00-base.xml
index 53ea98215..b06eff362 100644
--- a/tests/dictionaries/01base_certificate_owner_variable/xml/00-base.xml
+++ b/tests/dictionaries/01base_certificate_owner_variable/xml/00-base.xml
@@ -2,15 +2,27 @@
- /etc/pki/tls/certs/example.crt
+ certificate
+
+ /etc/pki/tls/certs/example.crt
+
+
+ /etc/pki/tls/private/example.key
+
+
+ /etc/pki/ca-trust/source/anchors/ca_example.crt
+
example
example
+
+ example.net
+
diff --git a/tests/dictionaries/01base_certificate_owner_variable/yml/00-base.yml b/tests/dictionaries/01base_certificate_owner_variable/yml/00-base.yml
index 282027c83..4300a7e71 100644
--- a/tests/dictionaries/01base_certificate_owner_variable/yml/00-base.yml
+++ b/tests/dictionaries/01base_certificate_owner_variable/yml/00-base.yml
@@ -3,15 +3,27 @@ services:
- service:
- name: test
certificate:
- - private: /etc/pki/tls/private/example.key
- authority: /etc/pki/ca-trust/source/anchors/ca_example.crt
+ - private: private
+ authority: authority
owner: owner
owner_type: variable
group: group
group_type: variable
- text: /etc/pki/tls/certs/example.crt
+ text: certificate
variables:
- variable:
+ - name: certificate
+ type: filename
+ value:
+ - text: /etc/pki/tls/certs/example.crt
+ - name: private
+ type: filename
+ value:
+ - text: /etc/pki/tls/private/example.key
+ - name: authority
+ type: filename
+ value:
+ - text: /etc/pki/ca-trust/source/anchors/ca_example.crt
- name: owner
type: unix_user
value:
@@ -20,3 +32,7 @@ variables:
type: unix_user
value:
- text: example
+ - name: server_name
+ type: domainname
+ value:
+ - text: example.net
diff --git a/tests/dictionaries/01base_certificate_owner_variable_wrong/xml/00-base.xml b/tests/dictionaries/01base_certificate_owner_variable_wrong/xml/00-base.xml
index 0a09eb03f..60b521cc4 100644
--- a/tests/dictionaries/01base_certificate_owner_variable_wrong/xml/00-base.xml
+++ b/tests/dictionaries/01base_certificate_owner_variable_wrong/xml/00-base.xml
@@ -2,15 +2,27 @@
- /etc/pki/tls/certs/example.crt
+ certificate
+
+ /etc/pki/tls/certs/example.crt
+
+
+ /etc/pki/tls/private/example.key
+
+
+ /etc/pki/ca-trust/source/anchors/ca_example.crt
+
example
example
+
+ example.net
+
diff --git a/tests/dictionaries/01base_certificate_owner_variable_wrong/yml/00-base.yml b/tests/dictionaries/01base_certificate_owner_variable_wrong/yml/00-base.yml
index 8e2114cd3..4bf01da64 100644
--- a/tests/dictionaries/01base_certificate_owner_variable_wrong/yml/00-base.yml
+++ b/tests/dictionaries/01base_certificate_owner_variable_wrong/yml/00-base.yml
@@ -3,15 +3,27 @@ services:
- service:
- name: test
certificate:
- - private: /etc/pki/tls/private/example.key
- authority: /etc/pki/ca-trust/source/anchors/ca_example.crt
+ - private: private
+ authority: authority
owner: owner
owner_type: variable
group: group
group_type: variable
- text: /etc/pki/tls/certs/example.crt
+ text: certificate
variables:
- variable:
+ - name: certificate
+ type: filename
+ value:
+ - text: /etc/pki/tls/certs/example.crt
+ - name: private
+ type: filename
+ value:
+ - text: /etc/pki/tls/private/example.key
+ - name: authority
+ type: filename
+ value:
+ - text: /etc/pki/ca-trust/source/anchors/ca_example.crt
- name: owner
value:
- text: example
@@ -19,3 +31,7 @@ variables:
type: unix_user
value:
- text: example
+ - name: server_name
+ type: domainname
+ value:
+ - text: example.net
diff --git a/tests/dictionaries/01base_certificate_variable/makedict/after.json b/tests/dictionaries/01base_certificate_variable/makedict/after.json
index 1d7cca464..86f1995b2 100644
--- a/tests/dictionaries/01base_certificate_variable/makedict/after.json
+++ b/tests/dictionaries/01base_certificate_variable/makedict/after.json
@@ -11,10 +11,18 @@
"owner": "default",
"value": "/etc/pki/ca-trust/source/anchors/ca_example.crt"
},
+ "rougail.server_name": {
+ "owner": "default",
+ "value": "example.net"
+ },
"services.test_service.certificates.certificate.authority": {
"owner": "default",
"value": "/etc/pki/ca-trust/source/anchors/ca_example.crt"
},
+ "services.test_service.certificates.certificate.domain": {
+ "owner": "default",
+ "value": "example.net"
+ },
"services.test_service.certificates.certificate.name": {
"owner": "default",
"value": "/etc/pki/tls/certs/example.crt"
diff --git a/tests/dictionaries/01base_certificate_variable/makedict/base.json b/tests/dictionaries/01base_certificate_variable/makedict/base.json
index a4c8a74eb..fb6919715 100644
--- a/tests/dictionaries/01base_certificate_variable/makedict/base.json
+++ b/tests/dictionaries/01base_certificate_variable/makedict/base.json
@@ -2,7 +2,9 @@
"rougail.certificate": "/etc/pki/tls/certs/example.crt",
"rougail.private": "/etc/pki/tls/private/example.key",
"rougail.authority": "/etc/pki/ca-trust/source/anchors/ca_example.crt",
+ "rougail.server_name": "example.net",
"services.test_service.certificates.certificate.authority": "/etc/pki/ca-trust/source/anchors/ca_example.crt",
+ "services.test_service.certificates.certificate.domain": "example.net",
"services.test_service.certificates.certificate.name": "/etc/pki/tls/certs/example.crt",
"services.test_service.certificates.certificate.private": "/etc/pki/tls/private/example.key",
"services.test_service.certificates.certificate.activate": true,
diff --git a/tests/dictionaries/01base_certificate_variable/makedict/before.json b/tests/dictionaries/01base_certificate_variable/makedict/before.json
index 1d7cca464..86f1995b2 100644
--- a/tests/dictionaries/01base_certificate_variable/makedict/before.json
+++ b/tests/dictionaries/01base_certificate_variable/makedict/before.json
@@ -11,10 +11,18 @@
"owner": "default",
"value": "/etc/pki/ca-trust/source/anchors/ca_example.crt"
},
+ "rougail.server_name": {
+ "owner": "default",
+ "value": "example.net"
+ },
"services.test_service.certificates.certificate.authority": {
"owner": "default",
"value": "/etc/pki/ca-trust/source/anchors/ca_example.crt"
},
+ "services.test_service.certificates.certificate.domain": {
+ "owner": "default",
+ "value": "example.net"
+ },
"services.test_service.certificates.certificate.name": {
"owner": "default",
"value": "/etc/pki/tls/certs/example.crt"
diff --git a/tests/dictionaries/01base_certificate_variable/tiramisu/base.py b/tests/dictionaries/01base_certificate_variable/tiramisu/base.py
index 48117d63a..eb8fdf112 100644
--- a/tests/dictionaries/01base_certificate_variable/tiramisu/base.py
+++ b/tests/dictionaries/01base_certificate_variable/tiramisu/base.py
@@ -21,16 +21,19 @@ except:
option_1 = FilenameOption(name="certificate", doc="certificate", default="/etc/pki/tls/certs/example.crt", properties=frozenset({"mandatory", "normal"}))
option_2 = FilenameOption(name="private", doc="private", default="/etc/pki/tls/private/example.key", properties=frozenset({"mandatory", "normal"}))
option_3 = FilenameOption(name="authority", doc="authority", default="/etc/pki/ca-trust/source/anchors/ca_example.crt", properties=frozenset({"mandatory", "normal"}))
-optiondescription_12 = OptionDescription(name="rougail", doc="Rougail", children=[option_1, option_2, option_3])
-option_8 = SymLinkOption(name="authority", opt=option_3)
-option_9 = SymLinkOption(name="name", opt=option_1)
-option_10 = SymLinkOption(name="private", opt=option_2)
-option_7 = BoolOption(name="activate", doc="activate", default=True)
-optiondescription_6 = OptionDescription(name="certificate", doc="certificate", children=[option_8, option_9, option_10, option_7])
-optiondescription_5 = OptionDescription(name="certificates", doc="certificates", children=[optiondescription_6])
-option_4 = BoolOption(name="activate", doc="activate", default=True)
-option_11 = BoolOption(name="manage", doc="manage", default=True)
-optiondescription_14 = OptionDescription(name="test_service", doc="test.service", children=[optiondescription_5, option_4, option_11])
-optiondescription_14.impl_set_information('type', "service")
-optiondescription_13 = OptionDescription(name="services", doc="services", children=[optiondescription_14], properties=frozenset({"hidden"}))
-option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_12, optiondescription_13])
+option_4 = DomainnameOption(name="server_name", doc="server_name", default="example.net", type='domainname', allow_ip=False, properties=frozenset({"mandatory", "normal"}))
+optiondescription_14 = OptionDescription(name="rougail", doc="Rougail", children=[option_1, option_2, option_3, option_4])
+option_9 = SymLinkOption(name="authority", opt=option_3)
+option_10 = SymLinkOption(name="domain", opt=option_4)
+option_11 = SymLinkOption(name="name", opt=option_1)
+option_12 = SymLinkOption(name="private", opt=option_2)
+option_8 = BoolOption(name="activate", doc="activate", default=True)
+optiondescription_7 = OptionDescription(name="certificate", doc="certificate", children=[option_9, option_10, option_11, option_12, option_8])
+optiondescription_7.impl_set_information('type', "client")
+optiondescription_6 = OptionDescription(name="certificates", doc="certificates", children=[optiondescription_7])
+option_5 = BoolOption(name="activate", doc="activate", default=True)
+option_13 = BoolOption(name="manage", doc="manage", default=True)
+optiondescription_16 = OptionDescription(name="test_service", doc="test.service", children=[optiondescription_6, option_5, option_13])
+optiondescription_16.impl_set_information('type', "service")
+optiondescription_15 = OptionDescription(name="services", doc="services", children=[optiondescription_16], properties=frozenset({"hidden"}))
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_14, optiondescription_15])
diff --git a/tests/dictionaries/01base_certificate_variable/tiramisu/multi.py b/tests/dictionaries/01base_certificate_variable/tiramisu/multi.py
index 7834fd585..84df4a6f1 100644
--- a/tests/dictionaries/01base_certificate_variable/tiramisu/multi.py
+++ b/tests/dictionaries/01base_certificate_variable/tiramisu/multi.py
@@ -21,33 +21,39 @@ except:
option_1 = FilenameOption(name="certificate", doc="certificate", default="/etc/pki/tls/certs/example.crt", properties=frozenset({"mandatory", "normal"}))
option_2 = FilenameOption(name="private", doc="private", default="/etc/pki/tls/private/example.key", properties=frozenset({"mandatory", "normal"}))
option_3 = FilenameOption(name="authority", doc="authority", default="/etc/pki/ca-trust/source/anchors/ca_example.crt", properties=frozenset({"mandatory", "normal"}))
-optiondescription_24 = OptionDescription(name="rougail", doc="Rougail", children=[option_1, option_2, option_3])
-option_11 = SymLinkOption(name="authority", opt=option_3)
-option_12 = SymLinkOption(name="name", opt=option_1)
-option_13 = SymLinkOption(name="private", opt=option_2)
-option_10 = BoolOption(name="activate", doc="activate", default=True)
-optiondescription_9 = OptionDescription(name="certificate", doc="certificate", children=[option_11, option_12, option_13, option_10])
-optiondescription_8 = OptionDescription(name="certificates", doc="certificates", children=[optiondescription_9])
-option_7 = BoolOption(name="activate", doc="activate", default=True)
-option_14 = BoolOption(name="manage", doc="manage", default=True)
-optiondescription_26 = OptionDescription(name="test_service", doc="test.service", children=[optiondescription_8, option_7, option_14])
-optiondescription_26.impl_set_information('type', "service")
-optiondescription_25 = OptionDescription(name="services", doc="services", children=[optiondescription_26], properties=frozenset({"hidden"}))
-optiondescription_23 = OptionDescription(name="1", doc="1", children=[optiondescription_24, optiondescription_25])
-option_4 = FilenameOption(name="certificate", doc="certificate", default="/etc/pki/tls/certs/example.crt", properties=frozenset({"mandatory", "normal"}))
-option_5 = FilenameOption(name="private", doc="private", default="/etc/pki/tls/private/example.key", properties=frozenset({"mandatory", "normal"}))
-option_6 = FilenameOption(name="authority", doc="authority", default="/etc/pki/ca-trust/source/anchors/ca_example.crt", properties=frozenset({"mandatory", "normal"}))
-optiondescription_28 = OptionDescription(name="rougail", doc="Rougail", children=[option_4, option_5, option_6])
-option_19 = SymLinkOption(name="authority", opt=option_6)
-option_20 = SymLinkOption(name="name", opt=option_4)
-option_21 = SymLinkOption(name="private", opt=option_5)
-option_18 = BoolOption(name="activate", doc="activate", default=True)
-optiondescription_17 = OptionDescription(name="certificate", doc="certificate", children=[option_19, option_20, option_21, option_18])
-optiondescription_16 = OptionDescription(name="certificates", doc="certificates", children=[optiondescription_17])
-option_15 = BoolOption(name="activate", doc="activate", default=True)
-option_22 = BoolOption(name="manage", doc="manage", default=True)
-optiondescription_30 = OptionDescription(name="test_service", doc="test.service", children=[optiondescription_16, option_15, option_22])
+option_4 = DomainnameOption(name="server_name", doc="server_name", default="example.net", type='domainname', allow_ip=False, properties=frozenset({"mandatory", "normal"}))
+optiondescription_28 = OptionDescription(name="rougail", doc="Rougail", children=[option_1, option_2, option_3, option_4])
+option_13 = SymLinkOption(name="authority", opt=option_3)
+option_14 = SymLinkOption(name="domain", opt=option_4)
+option_15 = SymLinkOption(name="name", opt=option_1)
+option_16 = SymLinkOption(name="private", opt=option_2)
+option_12 = BoolOption(name="activate", doc="activate", default=True)
+optiondescription_11 = OptionDescription(name="certificate", doc="certificate", children=[option_13, option_14, option_15, option_16, option_12])
+optiondescription_11.impl_set_information('type', "client")
+optiondescription_10 = OptionDescription(name="certificates", doc="certificates", children=[optiondescription_11])
+option_9 = BoolOption(name="activate", doc="activate", default=True)
+option_17 = BoolOption(name="manage", doc="manage", default=True)
+optiondescription_30 = OptionDescription(name="test_service", doc="test.service", children=[optiondescription_10, option_9, option_17])
optiondescription_30.impl_set_information('type', "service")
optiondescription_29 = OptionDescription(name="services", doc="services", children=[optiondescription_30], properties=frozenset({"hidden"}))
-optiondescription_27 = OptionDescription(name="2", doc="2", children=[optiondescription_28, optiondescription_29])
-option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_23, optiondescription_27])
+optiondescription_27 = OptionDescription(name="1", doc="1", children=[optiondescription_28, optiondescription_29])
+option_5 = FilenameOption(name="certificate", doc="certificate", default="/etc/pki/tls/certs/example.crt", properties=frozenset({"mandatory", "normal"}))
+option_6 = FilenameOption(name="private", doc="private", default="/etc/pki/tls/private/example.key", properties=frozenset({"mandatory", "normal"}))
+option_7 = FilenameOption(name="authority", doc="authority", default="/etc/pki/ca-trust/source/anchors/ca_example.crt", properties=frozenset({"mandatory", "normal"}))
+option_8 = DomainnameOption(name="server_name", doc="server_name", default="example.net", type='domainname', allow_ip=False, properties=frozenset({"mandatory", "normal"}))
+optiondescription_32 = OptionDescription(name="rougail", doc="Rougail", children=[option_5, option_6, option_7, option_8])
+option_22 = SymLinkOption(name="authority", opt=option_7)
+option_23 = SymLinkOption(name="domain", opt=option_8)
+option_24 = SymLinkOption(name="name", opt=option_5)
+option_25 = SymLinkOption(name="private", opt=option_6)
+option_21 = BoolOption(name="activate", doc="activate", default=True)
+optiondescription_20 = OptionDescription(name="certificate", doc="certificate", children=[option_22, option_23, option_24, option_25, option_21])
+optiondescription_20.impl_set_information('type', "client")
+optiondescription_19 = OptionDescription(name="certificates", doc="certificates", children=[optiondescription_20])
+option_18 = BoolOption(name="activate", doc="activate", default=True)
+option_26 = BoolOption(name="manage", doc="manage", default=True)
+optiondescription_34 = OptionDescription(name="test_service", doc="test.service", children=[optiondescription_19, option_18, option_26])
+optiondescription_34.impl_set_information('type', "service")
+optiondescription_33 = OptionDescription(name="services", doc="services", children=[optiondescription_34], properties=frozenset({"hidden"}))
+optiondescription_31 = OptionDescription(name="2", doc="2", children=[optiondescription_32, optiondescription_33])
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_27, optiondescription_31])
diff --git a/tests/dictionaries/01base_certificate_variable/xml/00-base.xml b/tests/dictionaries/01base_certificate_variable/xml/00-base.xml
index c86ae46b0..3ebc3ce7a 100644
--- a/tests/dictionaries/01base_certificate_variable/xml/00-base.xml
+++ b/tests/dictionaries/01base_certificate_variable/xml/00-base.xml
@@ -2,7 +2,7 @@
- certificate
+ certificate
@@ -15,5 +15,8 @@
/etc/pki/ca-trust/source/anchors/ca_example.crt
+
+ example.net
+
diff --git a/tests/dictionaries/01base_certificate_variable/yml/00-base.yml b/tests/dictionaries/01base_certificate_variable/yml/00-base.yml
index 1f56ab46c..66cc30908 100644
--- a/tests/dictionaries/01base_certificate_variable/yml/00-base.yml
+++ b/tests/dictionaries/01base_certificate_variable/yml/00-base.yml
@@ -4,10 +4,7 @@ services:
- name: test
certificate:
- private: private
- private_type: variable
authority: authority
- authority_type: variable
- certificate_type: variable
text: certificate
variables:
- variable:
@@ -23,3 +20,7 @@ variables:
type: filename
value:
- text: /etc/pki/ca-trust/source/anchors/ca_example.crt
+ - name: server_name
+ type: domainname
+ value:
+ - text: example.net
diff --git a/tests/dictionaries/10load_emptyvalue/__init__.py b/tests/dictionaries/10load_emptyvalue/__init__.py
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/dictionaries/10load_emptyvalue/makedict/after.json b/tests/dictionaries/10load_emptyvalue/makedict/after.json
deleted file mode 100644
index 7539982e7..000000000
--- a/tests/dictionaries/10load_emptyvalue/makedict/after.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
- "rougail.general.mode_conteneur_actif": {
- "owner": "default",
- "value": null
- },
- "rougail.general.mode_conteneur_actif2": {
- "owner": "default",
- "value": null
- }
-}
diff --git a/tests/dictionaries/10load_emptyvalue/makedict/base.json b/tests/dictionaries/10load_emptyvalue/makedict/base.json
deleted file mode 100644
index 121c737e6..000000000
--- a/tests/dictionaries/10load_emptyvalue/makedict/base.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
- "rougail.general.mode_conteneur_actif": null,
- "rougail.general.mode_conteneur_actif2": null
-}
diff --git a/tests/dictionaries/10load_emptyvalue/makedict/before.json b/tests/dictionaries/10load_emptyvalue/makedict/before.json
deleted file mode 100644
index 7539982e7..000000000
--- a/tests/dictionaries/10load_emptyvalue/makedict/before.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
- "rougail.general.mode_conteneur_actif": {
- "owner": "default",
- "value": null
- },
- "rougail.general.mode_conteneur_actif2": {
- "owner": "default",
- "value": null
- }
-}
diff --git a/tests/dictionaries/10load_emptyvalue/tiramisu/base.py b/tests/dictionaries/10load_emptyvalue/tiramisu/base.py
deleted file mode 100644
index e6841d826..000000000
--- a/tests/dictionaries/10load_emptyvalue/tiramisu/base.py
+++ /dev/null
@@ -1,25 +0,0 @@
-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
-
-def _load_functions(path):
- global _SourceFileLoader, _spec_from_loader, _module_from_spec, func
- loader = _SourceFileLoader('func', path)
- 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))
-_load_functions('tests/dictionaries/../eosfunc/test.py')
-try:
- from tiramisu3 import *
-except:
- from tiramisu import *
-option_2 = StrOption(name="mode_conteneur_actif", doc="No change", properties=frozenset({"normal"}))
-option_3 = StrOption(name="mode_conteneur_actif2", doc="No change", properties=frozenset({"normal"}))
-optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2, option_3], properties=frozenset({"normal"}))
-optiondescription_4 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1])
-option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_4])
diff --git a/tests/dictionaries/10load_emptyvalue/tiramisu/multi.py b/tests/dictionaries/10load_emptyvalue/tiramisu/multi.py
deleted file mode 100644
index 9b10aaa22..000000000
--- a/tests/dictionaries/10load_emptyvalue/tiramisu/multi.py
+++ /dev/null
@@ -1,31 +0,0 @@
-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
-
-def _load_functions(path):
- global _SourceFileLoader, _spec_from_loader, _module_from_spec, func
- loader = _SourceFileLoader('func', path)
- 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))
-_load_functions('tests/dictionaries/../eosfunc/test.py')
-try:
- from tiramisu3 import *
-except:
- from tiramisu import *
-option_2 = StrOption(name="mode_conteneur_actif", doc="No change", properties=frozenset({"normal"}))
-option_3 = StrOption(name="mode_conteneur_actif2", doc="No change", properties=frozenset({"normal"}))
-optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2, option_3], properties=frozenset({"normal"}))
-optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1])
-optiondescription_7 = OptionDescription(name="1", doc="1", children=[optiondescription_8])
-option_5 = StrOption(name="mode_conteneur_actif", doc="No change", properties=frozenset({"normal"}))
-option_6 = StrOption(name="mode_conteneur_actif2", doc="No change", properties=frozenset({"normal"}))
-optiondescription_4 = OptionDescription(name="general", doc="general", children=[option_5, option_6], properties=frozenset({"normal"}))
-optiondescription_10 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_4])
-optiondescription_9 = OptionDescription(name="2", doc="2", children=[optiondescription_10])
-option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_7, optiondescription_9])
diff --git a/tests/dictionaries/10valid_enum_param_empty/makedict/after.json b/tests/dictionaries/10valid_enum_param_empty/makedict/after.json
index 4c3ef489d..f7fecf93b 100644
--- a/tests/dictionaries/10valid_enum_param_empty/makedict/after.json
+++ b/tests/dictionaries/10valid_enum_param_empty/makedict/after.json
@@ -1,8 +1,4 @@
{
- "rougail.general.mode_conteneur_actif": {
- "owner": "default",
- "value": "non"
- },
"rougail.enumfam.enumvar": {
"owner": "default",
"value": null
diff --git a/tests/dictionaries/10valid_enum_param_empty/makedict/base.json b/tests/dictionaries/10valid_enum_param_empty/makedict/base.json
index 53dfede82..09f494be2 100644
--- a/tests/dictionaries/10valid_enum_param_empty/makedict/base.json
+++ b/tests/dictionaries/10valid_enum_param_empty/makedict/base.json
@@ -1,4 +1,3 @@
{
- "rougail.general.mode_conteneur_actif": "non",
"rougail.enumfam.enumvar": null
}
diff --git a/tests/dictionaries/10valid_enum_param_empty/makedict/before.json b/tests/dictionaries/10valid_enum_param_empty/makedict/before.json
index 4c3ef489d..f7fecf93b 100644
--- a/tests/dictionaries/10valid_enum_param_empty/makedict/before.json
+++ b/tests/dictionaries/10valid_enum_param_empty/makedict/before.json
@@ -1,8 +1,4 @@
{
- "rougail.general.mode_conteneur_actif": {
- "owner": "default",
- "value": "non"
- },
"rougail.enumfam.enumvar": {
"owner": "default",
"value": null
diff --git a/tests/dictionaries/10valid_enum_param_empty/tiramisu/base.py b/tests/dictionaries/10valid_enum_param_empty/tiramisu/base.py
index 211fbb9f5..77d80e032 100644
--- a/tests/dictionaries/10valid_enum_param_empty/tiramisu/base.py
+++ b/tests/dictionaries/10valid_enum_param_empty/tiramisu/base.py
@@ -18,10 +18,8 @@ try:
from tiramisu3 import *
except:
from tiramisu import *
-option_2 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"expert", "mandatory"}))
-optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2], properties=frozenset({"expert"}))
-option_4 = ChoiceOption(name="enumvar", doc="multi", values=(None,), properties=frozenset({"expert"}))
-option_4.impl_set_information('help', "bla bla bla")
-optiondescription_3 = OptionDescription(name="enumfam", doc="enumfam", children=[option_4], properties=frozenset({"expert"}))
-optiondescription_5 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1, optiondescription_3])
-option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_5])
+option_2 = ChoiceOption(name="enumvar", doc="multi", values=(None,), properties=frozenset({"expert"}))
+option_2.impl_set_information('help', "bla bla bla")
+optiondescription_1 = OptionDescription(name="enumfam", doc="enumfam", children=[option_2], properties=frozenset({"expert"}))
+optiondescription_3 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1])
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_3])
diff --git a/tests/dictionaries/10valid_enum_param_empty/tiramisu/multi.py b/tests/dictionaries/10valid_enum_param_empty/tiramisu/multi.py
index 44380ed6a..68586350d 100644
--- a/tests/dictionaries/10valid_enum_param_empty/tiramisu/multi.py
+++ b/tests/dictionaries/10valid_enum_param_empty/tiramisu/multi.py
@@ -18,18 +18,14 @@ try:
from tiramisu3 import *
except:
from tiramisu import *
-option_2 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"expert", "mandatory"}))
-optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2], properties=frozenset({"expert"}))
+option_2 = ChoiceOption(name="enumvar", doc="multi", values=(None,), properties=frozenset({"expert"}))
+option_2.impl_set_information('help', "bla bla bla")
+optiondescription_1 = OptionDescription(name="enumfam", doc="enumfam", children=[option_2], properties=frozenset({"expert"}))
+optiondescription_6 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1])
+optiondescription_5 = OptionDescription(name="1", doc="1", children=[optiondescription_6])
option_4 = ChoiceOption(name="enumvar", doc="multi", values=(None,), properties=frozenset({"expert"}))
option_4.impl_set_information('help', "bla bla bla")
optiondescription_3 = OptionDescription(name="enumfam", doc="enumfam", children=[option_4], properties=frozenset({"expert"}))
-optiondescription_10 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1, optiondescription_3])
-optiondescription_9 = OptionDescription(name="1", doc="1", children=[optiondescription_10])
-option_6 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"expert", "mandatory"}))
-optiondescription_5 = OptionDescription(name="general", doc="general", children=[option_6], properties=frozenset({"expert"}))
-option_8 = ChoiceOption(name="enumvar", doc="multi", values=(None,), properties=frozenset({"expert"}))
-option_8.impl_set_information('help', "bla bla bla")
-optiondescription_7 = OptionDescription(name="enumfam", doc="enumfam", children=[option_8], properties=frozenset({"expert"}))
-optiondescription_12 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_5, optiondescription_7])
-optiondescription_11 = OptionDescription(name="2", doc="2", children=[optiondescription_12])
-option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_9, optiondescription_11])
+optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_3])
+optiondescription_7 = OptionDescription(name="2", doc="2", children=[optiondescription_8])
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_5, optiondescription_7])
diff --git a/tests/dictionaries/10valid_enum_param_empty/xml/00-base.xml b/tests/dictionaries/10valid_enum_param_empty/xml/00-base.xml
index 1d3299e5b..7a8fa09d4 100644
--- a/tests/dictionaries/10valid_enum_param_empty/xml/00-base.xml
+++ b/tests/dictionaries/10valid_enum_param_empty/xml/00-base.xml
@@ -1,11 +1,6 @@
-
-
- non
-
-
diff --git a/tests/dictionaries/10valid_enum_param_empty/yml/00-base.yml b/tests/dictionaries/10valid_enum_param_empty/yml/00-base.yml
index d9194a907..708ebcdd7 100644
--- a/tests/dictionaries/10valid_enum_param_empty/yml/00-base.yml
+++ b/tests/dictionaries/10valid_enum_param_empty/yml/00-base.yml
@@ -1,15 +1,6 @@
version: '0.10'
variables:
- family:
- - name: general
- mode: expert
- variables:
- - variable:
- - name: mode_conteneur_actif
- type: string
- description: No change
- value:
- - text: non
- name: enumfam
mode: expert
variables:
diff --git a/tests/dictionaries/80base_certificate_wrong_value_authority/__init__.py b/tests/dictionaries/80base_certificate_wrong_value_authority/__init__.py
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/dictionaries/80base_certificate_wrong_value_authority/errno_96 b/tests/dictionaries/80base_certificate_wrong_value_authority/errno_96
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/dictionaries/80base_certificate_wrong_value_authority/xml/00-base.xml b/tests/dictionaries/80base_certificate_wrong_value_authority/xml/00-base.xml
deleted file mode 100644
index bfb3a45af..000000000
--- a/tests/dictionaries/80base_certificate_wrong_value_authority/xml/00-base.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
- /example.crt
-
-
-
diff --git a/tests/dictionaries/80base_certificate_wrong_value_authority/yml/00-base.yml b/tests/dictionaries/80base_certificate_wrong_value_authority/yml/00-base.yml
deleted file mode 100644
index 1704b0baa..000000000
--- a/tests/dictionaries/80base_certificate_wrong_value_authority/yml/00-base.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-version: '0.10'
-services:
-- service:
- - name: test
- certificate:
- - private: /example.key
- authority: ca_example.crt
- text: /example.crt
diff --git a/tests/dictionaries/80base_certificate_wrong_value_authority_variable/xml/00-base.xml b/tests/dictionaries/80base_certificate_wrong_value_authority_variable/xml/00-base.xml
index ba87bb642..dc9718d58 100644
--- a/tests/dictionaries/80base_certificate_wrong_value_authority_variable/xml/00-base.xml
+++ b/tests/dictionaries/80base_certificate_wrong_value_authority_variable/xml/00-base.xml
@@ -2,7 +2,7 @@
- certificate
+ certificate
diff --git a/tests/dictionaries/80base_certificate_wrong_value_certificate/__init__.py b/tests/dictionaries/80base_certificate_wrong_value_certificate/__init__.py
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/dictionaries/80base_certificate_wrong_value_certificate/errno_94 b/tests/dictionaries/80base_certificate_wrong_value_certificate/errno_94
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/dictionaries/80base_certificate_wrong_value_certificate/xml/00-base.xml b/tests/dictionaries/80base_certificate_wrong_value_certificate/xml/00-base.xml
deleted file mode 100644
index d8f5282d0..000000000
--- a/tests/dictionaries/80base_certificate_wrong_value_certificate/xml/00-base.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
- example.crt
-
-
-
diff --git a/tests/dictionaries/80base_certificate_wrong_value_certificate/yml/00-base.yml b/tests/dictionaries/80base_certificate_wrong_value_certificate/yml/00-base.yml
deleted file mode 100644
index f4e92cf3e..000000000
--- a/tests/dictionaries/80base_certificate_wrong_value_certificate/yml/00-base.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-version: '0.10'
-services:
-- service:
- - name: test
- certificate:
- - private: /example.key
- authority: /ca_example.crt
- text: example.crt
diff --git a/tests/dictionaries/80base_certificate_wrong_value_certificate_variable/xml/00-base.xml b/tests/dictionaries/80base_certificate_wrong_value_certificate_variable/xml/00-base.xml
index e5bb581b5..e43687c18 100644
--- a/tests/dictionaries/80base_certificate_wrong_value_certificate_variable/xml/00-base.xml
+++ b/tests/dictionaries/80base_certificate_wrong_value_certificate_variable/xml/00-base.xml
@@ -2,7 +2,7 @@
- certificate
+ certificate
diff --git a/tests/dictionaries/80base_certificate_wrong_value_private/__init__.py b/tests/dictionaries/80base_certificate_wrong_value_private/__init__.py
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/dictionaries/80base_certificate_wrong_value_private/xml/00-base.xml b/tests/dictionaries/80base_certificate_wrong_value_private/xml/00-base.xml
deleted file mode 100644
index e6ab2d2df..000000000
--- a/tests/dictionaries/80base_certificate_wrong_value_private/xml/00-base.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
- /example.crt
-
-
-
diff --git a/tests/dictionaries/80base_certificate_wrong_value_private/yml/00-base.yml b/tests/dictionaries/80base_certificate_wrong_value_private/yml/00-base.yml
deleted file mode 100644
index c3327727a..000000000
--- a/tests/dictionaries/80base_certificate_wrong_value_private/yml/00-base.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-version: '0.10'
-services:
-- service:
- - name: test
- certificate:
- - private: example.key
- authority: /ca_example.crt
- text: /example.crt
diff --git a/tests/dictionaries/80base_certificate_wrong_value_private_variable/xml/00-base.xml b/tests/dictionaries/80base_certificate_wrong_value_private_variable/xml/00-base.xml
index 3caea9ee2..84155cda7 100644
--- a/tests/dictionaries/80base_certificate_wrong_value_private_variable/xml/00-base.xml
+++ b/tests/dictionaries/80base_certificate_wrong_value_private_variable/xml/00-base.xml
@@ -2,7 +2,7 @@
- certificate
+ certificate
diff --git a/tests/dictionaries/01base_certificate/__init__.py b/tests/dictionaries/80load_emptyvalue/__init__.py
similarity index 100%
rename from tests/dictionaries/01base_certificate/__init__.py
rename to tests/dictionaries/80load_emptyvalue/__init__.py
diff --git a/tests/dictionaries/80base_certificate_wrong_value_private/errno_95 b/tests/dictionaries/80load_emptyvalue/errno_95
similarity index 100%
rename from tests/dictionaries/80base_certificate_wrong_value_private/errno_95
rename to tests/dictionaries/80load_emptyvalue/errno_95
diff --git a/tests/dictionaries/10load_emptyvalue/xml/00-base.xml b/tests/dictionaries/80load_emptyvalue/xml/00-base.xml
similarity index 68%
rename from tests/dictionaries/10load_emptyvalue/xml/00-base.xml
rename to tests/dictionaries/80load_emptyvalue/xml/00-base.xml
index d8cf2012d..c69cd6a9c 100644
--- a/tests/dictionaries/10load_emptyvalue/xml/00-base.xml
+++ b/tests/dictionaries/80load_emptyvalue/xml/00-base.xml
@@ -5,9 +5,6 @@
-
-
-
diff --git a/tests/dictionaries/10load_emptyvalue/yml/00-base.yml b/tests/dictionaries/80load_emptyvalue/yml/00-base.yml
similarity index 62%
rename from tests/dictionaries/10load_emptyvalue/yml/00-base.yml
rename to tests/dictionaries/80load_emptyvalue/yml/00-base.yml
index 0d37928d2..97f204519 100644
--- a/tests/dictionaries/10load_emptyvalue/yml/00-base.yml
+++ b/tests/dictionaries/80load_emptyvalue/yml/00-base.yml
@@ -9,8 +9,3 @@ variables:
description: No change
value:
- text: null
- - name: mode_conteneur_actif2
- type: string
- description: No change
- value:
- - text: null