diff --git a/src/rougail/data/rougail.dtd b/src/rougail/data/rougail.dtd
index f82882f16..6a930cf37 100644
--- a/src/rougail/data/rougail.dtd
+++ b/src/rougail/data/rougail.dtd
@@ -110,6 +110,7 @@
+
diff --git a/src/rougail/data/rougail.yml b/src/rougail/data/rougail.yml
index 5afd74486..0021492e4 100644
--- a/src/rougail/data/rougail.yml
+++ b/src/rougail/data/rougail.yml
@@ -121,6 +121,7 @@ mapping:
certificate_type:
type: str
enum:
+ - "string"
- "variable"
redefine:
type: bool
@@ -129,6 +130,17 @@ mapping:
enum:
- "client"
- "server"
+ format:
+ type: str
+ enum:
+ - "cert_key"
+ - "pem"
+ provider_type:
+ type: str
+ enum:
+ - "variable"
+ provider:
+ type: str
domain_type:
type: str
enum:
@@ -141,13 +153,6 @@ mapping:
- "variable"
server:
type: str
- group_type:
- type: str
- enum:
- - "unix_user"
- - "variable"
- group:
- type: str
owner_type:
type: str
enum:
@@ -155,18 +160,8 @@ mapping:
- "variable"
owner:
type: str
- authority_type:
- type: str
- enum:
- - "variable"
authority:
type: str
- private_type:
- type: str
- enum:
- - "variable"
- private:
- type: str
name:
type: str
undisable:
@@ -640,6 +635,8 @@ mapping:
type: bool
dynamic:
type: str
+ disabled:
+ type: bool
hidden:
type: bool
mode:
@@ -654,6 +651,8 @@ mapping:
type: bool
dynamic:
type: str
+ disabled:
+ type: bool
hidden:
type: bool
mode:
@@ -961,6 +960,8 @@ mapping:
type: bool
dynamic:
type: str
+ disabled:
+ type: bool
hidden:
type: bool
mode:
@@ -1268,6 +1269,8 @@ mapping:
type: bool
dynamic:
type: str
+ disabled:
+ type: bool
hidden:
type: bool
mode:
diff --git a/tests/dictionaries/01base_certificate_group_variable_wrong/errno_58 b/tests/dictionaries/01base_certificate_group_variable_wrong/errno_58
deleted file mode 100644
index e69de29bb..000000000
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
deleted file mode 100644
index 241c7aa2d..000000000
--- a/tests/dictionaries/01base_certificate_group_variable_wrong/xml/00-base.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-
-
-
-
- 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
deleted file mode 100644
index ca539e89d..000000000
--- a/tests/dictionaries/01base_certificate_group_variable_wrong/yml/00-base.yml
+++ /dev/null
@@ -1,37 +0,0 @@
-version: '0.10'
-services:
-- service:
- - name: test
- certificate:
- - private: private
- authority: authority
- owner: owner
- owner_type: variable
- group: group
- group_type: variable
- 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:
- - text: example
- - 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 a898b5835..98eea53be 100644
--- a/tests/dictionaries/01base_certificate_owner/makedict/after.json
+++ b/tests/dictionaries/01base_certificate_owner/makedict/after.json
@@ -1,44 +1,20 @@
{
- "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.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"
+ "value": "certificate"
},
"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 812cc8b69..6cbe8ce5d 100644
--- a/tests/dictionaries/01base_certificate_owner/makedict/base.json
+++ b/tests/dictionaries/01base_certificate_owner/makedict/base.json
@@ -1,14 +1,8 @@
{
- "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.name": "certificate",
"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 a898b5835..98eea53be 100644
--- a/tests/dictionaries/01base_certificate_owner/makedict/before.json
+++ b/tests/dictionaries/01base_certificate_owner/makedict/before.json
@@ -1,44 +1,20 @@
{
- "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.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"
+ "value": "certificate"
},
"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 eec3bb303..8ab71f6de 100644
--- a/tests/dictionaries/01base_certificate_owner/tiramisu/base.py
+++ b/tests/dictionaries/01base_certificate_owner/tiramisu/base.py
@@ -18,24 +18,20 @@ try:
from tiramisu3 import *
except:
from tiramisu import *
-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_1 = DomainnameOption(name="server_name", doc="server_name", default="example.net", type='domainname', allow_ip=False, properties=frozenset({"mandatory", "normal"}))
+optiondescription_10 = OptionDescription(name="rougail", doc="Rougail", children=[option_1])
+option_6 = SymLinkOption(name="domain", opt=option_1)
+option_7 = StrOption(name="name", doc="name", default="certificate")
+option_8 = UsernameOption(name="owner", doc="owner", default="example")
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])
+optiondescription_4 = OptionDescription(name="certificate", doc="certificate", children=[option_6, option_7, option_8, option_5])
+optiondescription_4.impl_set_information('authority', "authority")
+optiondescription_4.impl_set_information('format', "cert_key")
+optiondescription_4.impl_set_information('type', "client")
+optiondescription_3 = OptionDescription(name="certificates", doc="certificates", children=[optiondescription_4])
+option_2 = BoolOption(name="activate", doc="activate", default=True)
+option_9 = BoolOption(name="manage", doc="manage", default=True)
+optiondescription_12 = OptionDescription(name="test_service", doc="test.service", children=[optiondescription_3, option_2, option_9])
+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_10, optiondescription_11])
diff --git a/tests/dictionaries/01base_certificate_owner/tiramisu/multi.py b/tests/dictionaries/01base_certificate_owner/tiramisu/multi.py
index 496def0a8..2135df9c8 100644
--- a/tests/dictionaries/01base_certificate_owner/tiramisu/multi.py
+++ b/tests/dictionaries/01base_certificate_owner/tiramisu/multi.py
@@ -18,46 +18,38 @@ try:
from tiramisu3 import *
except:
from tiramisu import *
-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_1 = DomainnameOption(name="server_name", doc="server_name", default="example.net", type='domainname', allow_ip=False, properties=frozenset({"mandatory", "normal"}))
+optiondescription_20 = OptionDescription(name="rougail", doc="Rougail", children=[option_1])
+option_7 = SymLinkOption(name="domain", opt=option_1)
+option_8 = StrOption(name="name", doc="name", default="certificate")
+option_9 = UsernameOption(name="owner", doc="owner", default="example")
+option_6 = BoolOption(name="activate", doc="activate", default=True)
+optiondescription_5 = OptionDescription(name="certificate", doc="certificate", children=[option_7, option_8, option_9, option_6])
+optiondescription_5.impl_set_information('authority', "authority")
+optiondescription_5.impl_set_information('format', "cert_key")
+optiondescription_5.impl_set_information('type', "client")
+optiondescription_4 = OptionDescription(name="certificates", doc="certificates", children=[optiondescription_5])
+option_3 = BoolOption(name="activate", doc="activate", default=True)
+option_10 = BoolOption(name="manage", doc="manage", default=True)
+optiondescription_22 = OptionDescription(name="test_service", doc="test.service", children=[optiondescription_4, option_3, option_10])
+optiondescription_22.impl_set_information('type', "service")
+optiondescription_21 = OptionDescription(name="services", doc="services", children=[optiondescription_22], properties=frozenset({"hidden"}))
+optiondescription_19 = OptionDescription(name="1", doc="1", children=[optiondescription_20, optiondescription_21])
+option_2 = DomainnameOption(name="server_name", doc="server_name", default="example.net", type='domainname', allow_ip=False, properties=frozenset({"mandatory", "normal"}))
+optiondescription_24 = OptionDescription(name="rougail", doc="Rougail", children=[option_2])
+option_15 = SymLinkOption(name="domain", opt=option_2)
+option_16 = StrOption(name="name", doc="name", default="certificate")
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])
+option_14 = BoolOption(name="activate", doc="activate", default=True)
+optiondescription_13 = OptionDescription(name="certificate", doc="certificate", children=[option_15, option_16, option_17, option_14])
+optiondescription_13.impl_set_information('authority', "authority")
+optiondescription_13.impl_set_information('format', "cert_key")
+optiondescription_13.impl_set_information('type', "client")
+optiondescription_12 = OptionDescription(name="certificates", doc="certificates", children=[optiondescription_13])
+option_11 = BoolOption(name="activate", doc="activate", default=True)
+option_18 = BoolOption(name="manage", doc="manage", default=True)
+optiondescription_26 = OptionDescription(name="test_service", doc="test.service", children=[optiondescription_12, option_11, option_18])
+optiondescription_26.impl_set_information('type', "service")
+optiondescription_25 = OptionDescription(name="services", doc="services", children=[optiondescription_26], properties=frozenset({"hidden"}))
+optiondescription_23 = OptionDescription(name="2", doc="2", children=[optiondescription_24, optiondescription_25])
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_19, optiondescription_23])
diff --git a/tests/dictionaries/01base_certificate_owner/xml/00-base.xml b/tests/dictionaries/01base_certificate_owner/xml/00-base.xml
index 69b755f08..e62208de4 100644
--- a/tests/dictionaries/01base_certificate_owner/xml/00-base.xml
+++ b/tests/dictionaries/01base_certificate_owner/xml/00-base.xml
@@ -2,19 +2,10 @@
- certificate
+ 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 6042a6992..b3a43348c 100644
--- a/tests/dictionaries/01base_certificate_owner/yml/00-base.yml
+++ b/tests/dictionaries/01base_certificate_owner/yml/00-base.yml
@@ -3,25 +3,11 @@ services:
- service:
- name: test
certificate:
- - private: private
- authority: authority
+ - authority: authority
owner: example
- group: example
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:
diff --git a/tests/dictionaries/01base_certificate_owner_variable/makedict/after.json b/tests/dictionaries/01base_certificate_owner_variable/makedict/after.json
index 92f6e538d..1ff7b3444 100644
--- a/tests/dictionaries/01base_certificate_owner_variable/makedict/after.json
+++ b/tests/dictionaries/01base_certificate_owner_variable/makedict/after.json
@@ -1,52 +1,24 @@
{
- "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"
},
- "rougail.group": {
- "owner": "default",
- "value": "example"
- },
"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"
+ "value": "certificate"
},
"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_variable/makedict/base.json b/tests/dictionaries/01base_certificate_owner_variable/makedict/base.json
index 9654c4651..9ed24ebb2 100644
--- a/tests/dictionaries/01base_certificate_owner_variable/makedict/base.json
+++ b/tests/dictionaries/01base_certificate_owner_variable/makedict/base.json
@@ -1,16 +1,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.owner": "example",
- "rougail.group": "example",
"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.name": "certificate",
"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 92f6e538d..1ff7b3444 100644
--- a/tests/dictionaries/01base_certificate_owner_variable/makedict/before.json
+++ b/tests/dictionaries/01base_certificate_owner_variable/makedict/before.json
@@ -1,52 +1,24 @@
{
- "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"
},
- "rougail.group": {
- "owner": "default",
- "value": "example"
- },
"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"
+ "value": "certificate"
},
"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_variable/tiramisu/base.py b/tests/dictionaries/01base_certificate_owner_variable/tiramisu/base.py
index afe5ba089..993f0b402 100644
--- a/tests/dictionaries/01base_certificate_owner_variable/tiramisu/base.py
+++ b/tests/dictionaries/01base_certificate_owner_variable/tiramisu/base.py
@@ -18,26 +18,21 @@ try:
from tiramisu3 import *
except:
from tiramisu import *
-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])
+option_1 = UsernameOption(name="owner", doc="owner", default="example", properties=frozenset({"mandatory", "normal"}))
+option_2 = DomainnameOption(name="server_name", doc="server_name", default="example.net", type='domainname', allow_ip=False, properties=frozenset({"mandatory", "normal"}))
+optiondescription_11 = OptionDescription(name="rougail", doc="Rougail", children=[option_1, option_2])
+option_7 = SymLinkOption(name="domain", opt=option_2)
+option_8 = StrOption(name="name", doc="name", default="certificate")
+option_9 = SymLinkOption(name="owner", opt=option_1)
+option_6 = BoolOption(name="activate", doc="activate", default=True)
+optiondescription_5 = OptionDescription(name="certificate", doc="certificate", children=[option_7, option_8, option_9, option_6])
+optiondescription_5.impl_set_information('authority', "authority")
+optiondescription_5.impl_set_information('format', "cert_key")
+optiondescription_5.impl_set_information('type', "client")
+optiondescription_4 = OptionDescription(name="certificates", doc="certificates", children=[optiondescription_5])
+option_3 = BoolOption(name="activate", doc="activate", default=True)
+option_10 = BoolOption(name="manage", doc="manage", default=True)
+optiondescription_13 = OptionDescription(name="test_service", doc="test.service", children=[optiondescription_4, option_3, option_10])
+optiondescription_13.impl_set_information('type', "service")
+optiondescription_12 = OptionDescription(name="services", doc="services", children=[optiondescription_13], properties=frozenset({"hidden"}))
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_11, optiondescription_12])
diff --git a/tests/dictionaries/01base_certificate_owner_variable/tiramisu/multi.py b/tests/dictionaries/01base_certificate_owner_variable/tiramisu/multi.py
index 1244226ee..8492a3701 100644
--- a/tests/dictionaries/01base_certificate_owner_variable/tiramisu/multi.py
+++ b/tests/dictionaries/01base_certificate_owner_variable/tiramisu/multi.py
@@ -18,50 +18,40 @@ try:
from tiramisu3 import *
except:
from tiramisu import *
-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_1 = UsernameOption(name="owner", doc="owner", default="example", properties=frozenset({"mandatory", "normal"}))
+option_2 = DomainnameOption(name="server_name", doc="server_name", default="example.net", type='domainname', allow_ip=False, properties=frozenset({"mandatory", "normal"}))
+optiondescription_22 = OptionDescription(name="rougail", doc="Rougail", children=[option_1, option_2])
+option_9 = SymLinkOption(name="domain", opt=option_2)
+option_10 = StrOption(name="name", doc="name", default="certificate")
+option_11 = SymLinkOption(name="owner", opt=option_1)
+option_8 = BoolOption(name="activate", doc="activate", default=True)
+optiondescription_7 = OptionDescription(name="certificate", doc="certificate", children=[option_9, option_10, option_11, option_8])
+optiondescription_7.impl_set_information('authority', "authority")
+optiondescription_7.impl_set_information('format', "cert_key")
+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_12 = BoolOption(name="manage", doc="manage", default=True)
+optiondescription_24 = OptionDescription(name="test_service", doc="test.service", children=[optiondescription_6, option_5, option_12])
+optiondescription_24.impl_set_information('type', "service")
+optiondescription_23 = OptionDescription(name="services", doc="services", children=[optiondescription_24], properties=frozenset({"hidden"}))
+optiondescription_21 = OptionDescription(name="1", doc="1", children=[optiondescription_22, optiondescription_23])
+option_3 = UsernameOption(name="owner", doc="owner", default="example", 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_26 = OptionDescription(name="rougail", doc="Rougail", children=[option_3, option_4])
+option_17 = SymLinkOption(name="domain", opt=option_4)
+option_18 = StrOption(name="name", doc="name", default="certificate")
+option_19 = SymLinkOption(name="owner", opt=option_3)
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 = OptionDescription(name="certificate", doc="certificate", children=[option_17, option_18, option_19, option_16])
+optiondescription_15.impl_set_information('authority', "authority")
+optiondescription_15.impl_set_information('format', "cert_key")
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])
+option_20 = BoolOption(name="manage", doc="manage", default=True)
+optiondescription_28 = OptionDescription(name="test_service", doc="test.service", children=[optiondescription_14, option_13, option_20])
+optiondescription_28.impl_set_information('type', "service")
+optiondescription_27 = OptionDescription(name="services", doc="services", children=[optiondescription_28], properties=frozenset({"hidden"}))
+optiondescription_25 = OptionDescription(name="2", doc="2", children=[optiondescription_26, optiondescription_27])
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_21, optiondescription_25])
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 b06eff362..4c70230f1 100644
--- a/tests/dictionaries/01base_certificate_owner_variable/xml/00-base.xml
+++ b/tests/dictionaries/01base_certificate_owner_variable/xml/00-base.xml
@@ -2,25 +2,13 @@
- certificate
+ 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 4300a7e71..9608866b6 100644
--- a/tests/dictionaries/01base_certificate_owner_variable/yml/00-base.yml
+++ b/tests/dictionaries/01base_certificate_owner_variable/yml/00-base.yml
@@ -3,35 +3,16 @@ services:
- service:
- name: test
certificate:
- - private: private
- authority: authority
+ - authority: authority
owner: owner
owner_type: variable
- group: group
- group_type: variable
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:
- text: example
- - name: group
- type: unix_user
- value:
- - text: example
- name: server_name
type: domainname
value:
diff --git a/tests/dictionaries/01base_certificate_owner_variable_wrong/__init__.py b/tests/dictionaries/01base_certificate_owner_variable_wrong/__init__.py
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/dictionaries/01base_certificate_owner_variable_wrong/errno_58 b/tests/dictionaries/01base_certificate_owner_variable_wrong/errno_58
deleted file mode 100644
index e69de29bb..000000000
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
deleted file mode 100644
index 60b521cc4..000000000
--- a/tests/dictionaries/01base_certificate_owner_variable_wrong/xml/00-base.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-
-
-
-
- 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
deleted file mode 100644
index 4bf01da64..000000000
--- a/tests/dictionaries/01base_certificate_owner_variable_wrong/yml/00-base.yml
+++ /dev/null
@@ -1,37 +0,0 @@
-version: '0.10'
-services:
-- service:
- - name: test
- certificate:
- - private: private
- authority: authority
- owner: owner
- owner_type: variable
- group: group
- group_type: variable
- 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
- - name: group
- type: unix_user
- value:
- - text: example
- - name: server_name
- type: domainname
- value:
- - text: example.net
diff --git a/tests/dictionaries/01base_certificate_variable/__init__.py b/tests/dictionaries/01base_certificate_variable/__init__.py
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/dictionaries/01base_certificate_variable/makedict/after.json b/tests/dictionaries/01base_certificate_variable/makedict/after.json
deleted file mode 100644
index 86f1995b2..000000000
--- a/tests/dictionaries/01base_certificate_variable/makedict/after.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
- "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.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"
- },
- "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
- },
- "services.test_service.activate": {
- "owner": "default",
- "value": true
- },
- "services.test_service.manage": {
- "owner": "default",
- "value": true
- }
-}
diff --git a/tests/dictionaries/01base_certificate_variable/makedict/base.json b/tests/dictionaries/01base_certificate_variable/makedict/base.json
deleted file mode 100644
index fb6919715..000000000
--- a/tests/dictionaries/01base_certificate_variable/makedict/base.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
- "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,
- "services.test_service.activate": true,
- "services.test_service.manage": true
-}
diff --git a/tests/dictionaries/01base_certificate_variable/makedict/before.json b/tests/dictionaries/01base_certificate_variable/makedict/before.json
deleted file mode 100644
index 86f1995b2..000000000
--- a/tests/dictionaries/01base_certificate_variable/makedict/before.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
- "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.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"
- },
- "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
- },
- "services.test_service.activate": {
- "owner": "default",
- "value": true
- },
- "services.test_service.manage": {
- "owner": "default",
- "value": true
- }
-}
diff --git a/tests/dictionaries/01base_certificate_variable/tiramisu/base.py b/tests/dictionaries/01base_certificate_variable/tiramisu/base.py
deleted file mode 100644
index eb8fdf112..000000000
--- a/tests/dictionaries/01base_certificate_variable/tiramisu/base.py
+++ /dev/null
@@ -1,39 +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_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_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
deleted file mode 100644
index 84df4a6f1..000000000
--- a/tests/dictionaries/01base_certificate_variable/tiramisu/multi.py
+++ /dev/null
@@ -1,59 +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_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_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="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
deleted file mode 100644
index 3ebc3ce7a..000000000
--- a/tests/dictionaries/01base_certificate_variable/xml/00-base.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-
-
- 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_variable/yml/00-base.yml b/tests/dictionaries/01base_certificate_variable/yml/00-base.yml
deleted file mode 100644
index 66cc30908..000000000
--- a/tests/dictionaries/01base_certificate_variable/yml/00-base.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-version: '0.10'
-services:
-- service:
- - name: test
- certificate:
- - private: private
- authority: authority
- 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_group_variable_wrong/__init__.py b/tests/dictionaries/20family_disabled/__init__.py
similarity index 100%
rename from tests/dictionaries/01base_certificate_group_variable_wrong/__init__.py
rename to tests/dictionaries/20family_disabled/__init__.py
diff --git a/tests/dictionaries/20family_disabled/makedict/after.json b/tests/dictionaries/20family_disabled/makedict/after.json
new file mode 100644
index 000000000..2c63c0851
--- /dev/null
+++ b/tests/dictionaries/20family_disabled/makedict/after.json
@@ -0,0 +1,2 @@
+{
+}
diff --git a/tests/dictionaries/20family_disabled/makedict/base.json b/tests/dictionaries/20family_disabled/makedict/base.json
new file mode 100644
index 000000000..2c63c0851
--- /dev/null
+++ b/tests/dictionaries/20family_disabled/makedict/base.json
@@ -0,0 +1,2 @@
+{
+}
diff --git a/tests/dictionaries/20family_disabled/makedict/before.json b/tests/dictionaries/20family_disabled/makedict/before.json
new file mode 100644
index 000000000..2c63c0851
--- /dev/null
+++ b/tests/dictionaries/20family_disabled/makedict/before.json
@@ -0,0 +1,2 @@
+{
+}
diff --git a/tests/dictionaries/20family_disabled/tiramisu/base.py b/tests/dictionaries/20family_disabled/tiramisu/base.py
new file mode 100644
index 000000000..3473b27a2
--- /dev/null
+++ b/tests/dictionaries/20family_disabled/tiramisu/base.py
@@ -0,0 +1,24 @@
+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", default="non", properties=frozenset({"disabled", "mandatory", "normal"}))
+optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2], properties=frozenset({"disabled", "normal"}))
+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/20family_disabled/tiramisu/multi.py b/tests/dictionaries/20family_disabled/tiramisu/multi.py
new file mode 100644
index 000000000..67f3b6f53
--- /dev/null
+++ b/tests/dictionaries/20family_disabled/tiramisu/multi.py
@@ -0,0 +1,29 @@
+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", default="non", properties=frozenset({"disabled", "mandatory", "normal"}))
+optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2], properties=frozenset({"disabled", "normal"}))
+optiondescription_6 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1])
+optiondescription_5 = OptionDescription(name="1", doc="1", children=[optiondescription_6])
+option_4 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"disabled", "mandatory", "normal"}))
+optiondescription_3 = OptionDescription(name="general", doc="general", children=[option_4], properties=frozenset({"disabled", "normal"}))
+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/20family_disabled/xml/00-base.xml b/tests/dictionaries/20family_disabled/xml/00-base.xml
new file mode 100644
index 000000000..22960b089
--- /dev/null
+++ b/tests/dictionaries/20family_disabled/xml/00-base.xml
@@ -0,0 +1,10 @@
+
+
+
+
+
+ non
+
+
+
+
diff --git a/tests/dictionaries/20family_disabled/xml/01-base.xml b/tests/dictionaries/20family_disabled/xml/01-base.xml
new file mode 100644
index 000000000..7f936e372
--- /dev/null
+++ b/tests/dictionaries/20family_disabled/xml/01-base.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
diff --git a/tests/dictionaries/20family_disabled/yml/00-base.yml b/tests/dictionaries/20family_disabled/yml/00-base.yml
new file mode 100644
index 000000000..aeb28e4f3
--- /dev/null
+++ b/tests/dictionaries/20family_disabled/yml/00-base.yml
@@ -0,0 +1,12 @@
+version: '0.10'
+variables:
+- family:
+ - name: general
+ variables:
+ - variable:
+ - name: mode_conteneur_actif
+ type: string
+ description: No change
+ disabled: true
+ value:
+ - text: non
diff --git a/tests/dictionaries/20family_disabled/yml/01-base.yml b/tests/dictionaries/20family_disabled/yml/01-base.yml
new file mode 100644
index 000000000..7a4aaed83
--- /dev/null
+++ b/tests/dictionaries/20family_disabled/yml/01-base.yml
@@ -0,0 +1,5 @@
+version: '0.10'
+variables:
+- family:
+ - name: general
+ disabled: true
diff --git a/tests/dictionaries/80base_certificate_wrong_value_authority_variable/__init__.py b/tests/dictionaries/80base_certificate_wrong_value_authority_variable/__init__.py
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/dictionaries/80base_certificate_wrong_value_authority_variable/errno_92 b/tests/dictionaries/80base_certificate_wrong_value_authority_variable/errno_92
deleted file mode 100644
index e69de29bb..000000000
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
deleted file mode 100644
index dc9718d58..000000000
--- a/tests/dictionaries/80base_certificate_wrong_value_authority_variable/xml/00-base.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-
-
- certificate
-
-
-
-
- /etc/pki/tls/certs/example.crt
-
-
- /etc/pki/tls/private/example.key
-
-
- /etc/pki/ca-trust/source/anchors/ca_example.crt
-
-
-
diff --git a/tests/dictionaries/80base_certificate_wrong_value_authority_variable/yml/00-base.yml b/tests/dictionaries/80base_certificate_wrong_value_authority_variable/yml/00-base.yml
deleted file mode 100644
index 8f7f4c35f..000000000
--- a/tests/dictionaries/80base_certificate_wrong_value_authority_variable/yml/00-base.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-version: '0.10'
-services:
-- service:
- - name: test
- certificate:
- - private: private
- private_type: variable
- authority: authority
- authority_type: variable
- certificate_type: variable
- 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
- value:
- - text: /etc/pki/ca-trust/source/anchors/ca_example.crt
diff --git a/tests/dictionaries/80base_certificate_wrong_value_certificate_variable/__init__.py b/tests/dictionaries/80base_certificate_wrong_value_certificate_variable/__init__.py
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/dictionaries/80base_certificate_wrong_value_certificate_variable/errno_90 b/tests/dictionaries/80base_certificate_wrong_value_certificate_variable/errno_90
deleted file mode 100644
index e69de29bb..000000000
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
deleted file mode 100644
index e43687c18..000000000
--- a/tests/dictionaries/80base_certificate_wrong_value_certificate_variable/xml/00-base.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-
-
- certificate
-
-
-
-
- /etc/pki/tls/certs/example.crt
-
-
- /etc/pki/tls/private/example.key
-
-
- /etc/pki/ca-trust/source/anchors/ca_example.crt
-
-
-
diff --git a/tests/dictionaries/80base_certificate_wrong_value_certificate_variable/yml/00-base.yml b/tests/dictionaries/80base_certificate_wrong_value_certificate_variable/yml/00-base.yml
deleted file mode 100644
index 239d96c7a..000000000
--- a/tests/dictionaries/80base_certificate_wrong_value_certificate_variable/yml/00-base.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-version: '0.10'
-services:
-- service:
- - name: test
- certificate:
- - private: private
- private_type: variable
- authority: authority
- authority_type: variable
- certificate_type: variable
- text: certificate
-variables:
-- variable:
- - name: certificate
- 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
diff --git a/tests/dictionaries/80base_certificate_wrong_value_private_variable/__init__.py b/tests/dictionaries/80base_certificate_wrong_value_private_variable/__init__.py
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/dictionaries/80base_certificate_wrong_value_private_variable/errno_91 b/tests/dictionaries/80base_certificate_wrong_value_private_variable/errno_91
deleted file mode 100644
index e69de29bb..000000000
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
deleted file mode 100644
index 84155cda7..000000000
--- a/tests/dictionaries/80base_certificate_wrong_value_private_variable/xml/00-base.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-
-
- certificate
-
-
-
-
- /etc/pki/tls/certs/example.crt
-
-
- /etc/pki/tls/private/example.key
-
-
- /etc/pki/ca-trust/source/anchors/ca_example.crt
-
-
-
diff --git a/tests/dictionaries/80base_certificate_wrong_value_private_variable/yml/00-base.yml b/tests/dictionaries/80base_certificate_wrong_value_private_variable/yml/00-base.yml
deleted file mode 100644
index 424d8248f..000000000
--- a/tests/dictionaries/80base_certificate_wrong_value_private_variable/yml/00-base.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-version: '0.10'
-services:
-- service:
- - name: test
- certificate:
- - private: private
- private_type: variable
- authority: authority
- authority_type: variable
- certificate_type: variable
- text: certificate
-variables:
-- variable:
- - name: certificate
- type: filename
- value:
- - text: /etc/pki/tls/certs/example.crt
- - name: private
- value:
- - text: /etc/pki/tls/private/example.key
- - name: authority
- type: filename
- value:
- - text: /etc/pki/ca-trust/source/anchors/ca_example.crt