diff --git a/src/rougail/data/rougail.dtd b/src/rougail/data/rougail.dtd
index 5b3e0972c..b7c89b054 100644
--- a/src/rougail/data/rougail.dtd
+++ b/src/rougail/data/rougail.dtd
@@ -54,7 +54,7 @@
-
+
@@ -77,13 +77,13 @@
-
+
-
+
diff --git a/src/rougail/data/rougail.yml b/src/rougail/data/rougail.yml
index ae93c8a64..e068c81b5 100644
--- a/src/rougail/data/rougail.yml
+++ b/src/rougail/data/rougail.yml
@@ -60,7 +60,7 @@ mapping:
enum:
- "none"
- "creole"
- - "jinja2"
+ - "jinja"
- "creole_legacy"
redefine:
type: bool
@@ -103,7 +103,7 @@ mapping:
enum:
- "none"
- "creole"
- - "jinja2"
+ - "jinja"
name:
type: str
undisable:
@@ -123,7 +123,7 @@ mapping:
enum:
- "none"
- "creole"
- - "jinja2"
+ - "jinja"
disabled:
type: bool
servicelist:
@@ -137,148 +137,9 @@ mapping:
- type: map
mapping:
variable:
- type: map
- mapping:
- choice:
- required: false
- type: seq
- sequence:
- - type: map
- mapping:
- text:
- required: false
- type: any
- param:
- required: false
- type: seq
- sequence:
- - type: map
- mapping:
- text:
- required: false
- type: any
- type:
- type: str
- enum:
- - "string"
- - "number"
- - "nil"
- - "space"
- - "boolean"
- - "variable"
- - "function"
- - "information"
- - "target_information"
- - "suffix"
- - "index"
- optional:
- type: bool
- propertyerror:
- type: bool
- name:
- type: str
- type:
- type: str
- enum:
- - "string"
- - "number"
- - "nil"
- - "space"
- - "boolean"
- - "function"
- - "variable"
- name:
- type: str
- value:
- required: false
- type: seq
- sequence:
- - type: map
- mapping:
- text:
- required: false
- type: any
- type:
- type: str
- enum:
- - "string"
- - "number"
- - "nil"
- - "space"
- - "boolean"
- name:
- type: str
- test:
- type: str
- supplier:
- type: str
- provider:
- type: str
- remove_fill:
- type: bool
- remove_condition:
- type: bool
- remove_check:
- type: bool
- remove_choice:
- type: bool
- mode:
- type: str
- auto_save:
- type: bool
- auto_freeze:
- type: bool
- mandatory:
- type: bool
- exists:
- type: bool
- redefine:
- type: bool
- unique:
- type: bool
- multi:
- type: bool
- disabled:
- type: bool
- hidden:
- type: bool
- help:
- type: str
- description:
- type: str
- type:
- type: str
- enum:
- - "number"
- - "float"
- - "string"
- - "password"
- - "secret"
- - "mail"
- - "boolean"
- - "filename"
- - "date"
- - "unix_user"
- - "ip"
- - "local_ip"
- - "netmask"
- - "network"
- - "broadcast"
- - "netbios"
- - "domainname"
- - "hostname"
- - "web_address"
- - "port"
- - "mac"
- - "cidr"
- - "network_cidr"
- - "choice"
- family:
- type: map
- mapping:
- variable:
- required: false
- type: map
+ type: seq
+ sequence:
+ - type: map
mapping:
choice:
required: false
@@ -414,155 +275,16 @@ mapping:
- "cidr"
- "network_cidr"
- "choice"
- family:
- required: false
- type: map
+ family:
+ type: seq
+ sequence:
+ - type: map
mapping:
variable:
required: false
- type: map
- mapping:
- choice:
- required: false
- type: seq
- sequence:
- - type: map
- mapping:
- text:
- required: false
- type: any
- param:
- required: false
- type: seq
- sequence:
- - type: map
- mapping:
- text:
- required: false
- type: any
- type:
- type: str
- enum:
- - "string"
- - "number"
- - "nil"
- - "space"
- - "boolean"
- - "variable"
- - "function"
- - "information"
- - "target_information"
- - "suffix"
- - "index"
- optional:
- type: bool
- propertyerror:
- type: bool
- name:
- type: str
- type:
- type: str
- enum:
- - "string"
- - "number"
- - "nil"
- - "space"
- - "boolean"
- - "function"
- - "variable"
- name:
- type: str
- value:
- required: false
- type: seq
- sequence:
- - type: map
- mapping:
- text:
- required: false
- type: any
- type:
- type: str
- enum:
- - "string"
- - "number"
- - "nil"
- - "space"
- - "boolean"
- name:
- type: str
- test:
- type: str
- supplier:
- type: str
- provider:
- type: str
- remove_fill:
- type: bool
- remove_condition:
- type: bool
- remove_check:
- type: bool
- remove_choice:
- type: bool
- mode:
- type: str
- auto_save:
- type: bool
- auto_freeze:
- type: bool
- mandatory:
- type: bool
- exists:
- type: bool
- redefine:
- type: bool
- unique:
- type: bool
- multi:
- type: bool
- disabled:
- type: bool
- hidden:
- type: bool
- help:
- type: str
- description:
- type: str
- type:
- type: str
- enum:
- - "number"
- - "float"
- - "string"
- - "password"
- - "secret"
- - "mail"
- - "boolean"
- - "filename"
- - "date"
- - "unix_user"
- - "ip"
- - "local_ip"
- - "netmask"
- - "network"
- - "broadcast"
- - "netbios"
- - "domainname"
- - "hostname"
- - "web_address"
- - "port"
- - "mac"
- - "cidr"
- - "network_cidr"
- - "choice"
- family:
- required: false
- type: map
- mapping:
- variable:
- required: false
- type: map
+ type: seq
+ sequence:
+ - type: map
mapping:
choice:
required: false
@@ -698,148 +420,152 @@ mapping:
- "cidr"
- "network_cidr"
- "choice"
- family:
- required: false
- type: map
+ family:
+ required: false
+ type: seq
+ sequence:
+ - type: map
mapping:
variable:
required: false
- type: map
- mapping:
- choice:
- required: false
- type: seq
- sequence:
- - type: map
- mapping:
- text:
- required: false
- type: any
- param:
- required: false
- type: seq
- sequence:
- - type: map
- mapping:
- text:
- required: false
- type: any
- type:
- type: str
- enum:
- - "string"
- - "number"
- - "nil"
- - "space"
- - "boolean"
- - "variable"
- - "function"
- - "information"
- - "target_information"
- - "suffix"
- - "index"
- optional:
- type: bool
- propertyerror:
- type: bool
- name:
- type: str
- type:
- type: str
- enum:
- - "string"
- - "number"
- - "nil"
- - "space"
- - "boolean"
- - "function"
- - "variable"
- name:
- type: str
- value:
- required: false
- type: seq
- sequence:
- - type: map
- mapping:
- text:
- required: false
- type: any
- type:
- type: str
- enum:
- - "string"
- - "number"
- - "nil"
- - "space"
- - "boolean"
- name:
- type: str
- test:
- type: str
- supplier:
- type: str
- provider:
- type: str
- remove_fill:
- type: bool
- remove_condition:
- type: bool
- remove_check:
- type: bool
- remove_choice:
- type: bool
- mode:
- type: str
- auto_save:
- type: bool
- auto_freeze:
- type: bool
- mandatory:
- type: bool
- exists:
- type: bool
- redefine:
- type: bool
- unique:
- type: bool
- multi:
- type: bool
- disabled:
- type: bool
- hidden:
- type: bool
- help:
- type: str
- description:
- type: str
- type:
- type: str
- enum:
- - "number"
- - "float"
- - "string"
- - "password"
- - "secret"
- - "mail"
- - "boolean"
- - "filename"
- - "date"
- - "unix_user"
- - "ip"
- - "local_ip"
- - "netmask"
- - "network"
- - "broadcast"
- - "netbios"
- - "domainname"
- - "hostname"
- - "web_address"
- - "port"
- - "mac"
- - "cidr"
- - "network_cidr"
- - "choice"
+ type: seq
+ sequence:
+ - type: map
+ mapping:
+ choice:
+ required: false
+ type: seq
+ sequence:
+ - type: map
+ mapping:
+ text:
+ required: false
+ type: any
+ param:
+ required: false
+ type: seq
+ sequence:
+ - type: map
+ mapping:
+ text:
+ required: false
+ type: any
+ type:
+ type: str
+ enum:
+ - "string"
+ - "number"
+ - "nil"
+ - "space"
+ - "boolean"
+ - "variable"
+ - "function"
+ - "information"
+ - "target_information"
+ - "suffix"
+ - "index"
+ optional:
+ type: bool
+ propertyerror:
+ type: bool
+ name:
+ type: str
+ type:
+ type: str
+ enum:
+ - "string"
+ - "number"
+ - "nil"
+ - "space"
+ - "boolean"
+ - "function"
+ - "variable"
+ name:
+ type: str
+ value:
+ required: false
+ type: seq
+ sequence:
+ - type: map
+ mapping:
+ text:
+ required: false
+ type: any
+ type:
+ type: str
+ enum:
+ - "string"
+ - "number"
+ - "nil"
+ - "space"
+ - "boolean"
+ name:
+ type: str
+ test:
+ type: str
+ supplier:
+ type: str
+ provider:
+ type: str
+ remove_fill:
+ type: bool
+ remove_condition:
+ type: bool
+ remove_check:
+ type: bool
+ remove_choice:
+ type: bool
+ mode:
+ type: str
+ auto_save:
+ type: bool
+ auto_freeze:
+ type: bool
+ mandatory:
+ type: bool
+ exists:
+ type: bool
+ redefine:
+ type: bool
+ unique:
+ type: bool
+ multi:
+ type: bool
+ disabled:
+ type: bool
+ hidden:
+ type: bool
+ help:
+ type: str
+ description:
+ type: str
+ type:
+ type: str
+ enum:
+ - "number"
+ - "float"
+ - "string"
+ - "password"
+ - "secret"
+ - "mail"
+ - "boolean"
+ - "filename"
+ - "date"
+ - "unix_user"
+ - "ip"
+ - "local_ip"
+ - "netmask"
+ - "network"
+ - "broadcast"
+ - "netbios"
+ - "domainname"
+ - "hostname"
+ - "web_address"
+ - "port"
+ - "mac"
+ - "cidr"
+ - "network_cidr"
+ - "choice"
family:
required: false
name:
@@ -856,20 +582,6 @@ mapping:
type: str
description:
type: str
- name:
- type: str
- leadership:
- type: bool
- dynamic:
- type: str
- hidden:
- type: bool
- mode:
- type: str
- help:
- type: str
- description:
- type: str
name:
type: str
leadership:
@@ -884,38 +596,67 @@ mapping:
type: str
description:
type: str
- name:
- type: str
- leadership:
- type: bool
- dynamic:
- type: str
- hidden:
- type: bool
- mode:
- type: str
- help:
- type: str
- description:
- type: str
- variables:
- type: seq
- sequence:
- - type: map
- mapping:
- variable:
- type: map
+ variables:
+ type: seq
+ sequence:
+ - type: map
mapping:
- choice:
- required: false
+ variable:
type: seq
sequence:
- type: map
mapping:
- text:
+ choice:
required: false
- type: any
- param:
+ type: seq
+ sequence:
+ - type: map
+ mapping:
+ text:
+ required: false
+ type: any
+ param:
+ required: false
+ type: seq
+ sequence:
+ - type: map
+ mapping:
+ text:
+ required: false
+ type: any
+ type:
+ type: str
+ enum:
+ - "string"
+ - "number"
+ - "nil"
+ - "space"
+ - "boolean"
+ - "variable"
+ - "function"
+ - "information"
+ - "target_information"
+ - "suffix"
+ - "index"
+ optional:
+ type: bool
+ propertyerror:
+ type: bool
+ name:
+ type: str
+ type:
+ type: str
+ enum:
+ - "string"
+ - "number"
+ - "nil"
+ - "space"
+ - "boolean"
+ - "function"
+ - "variable"
+ name:
+ type: str
+ value:
required: false
type: seq
sequence:
@@ -932,419 +673,83 @@ mapping:
- "nil"
- "space"
- "boolean"
- - "variable"
- - "function"
- - "information"
- - "target_information"
- - "suffix"
- - "index"
- optional:
- type: bool
- propertyerror:
- type: bool
- name:
- type: str
- type:
- type: str
- enum:
- - "string"
- - "number"
- - "nil"
- - "space"
- - "boolean"
- - "function"
- - "variable"
name:
type: str
- value:
- required: false
- type: seq
- sequence:
- - type: map
- mapping:
- text:
- required: false
- type: any
+ test:
+ type: str
+ supplier:
+ type: str
+ provider:
+ type: str
+ remove_fill:
+ type: bool
+ remove_condition:
+ type: bool
+ remove_check:
+ type: bool
+ remove_choice:
+ type: bool
+ mode:
+ type: str
+ auto_save:
+ type: bool
+ auto_freeze:
+ type: bool
+ mandatory:
+ type: bool
+ exists:
+ type: bool
+ redefine:
+ type: bool
+ unique:
+ type: bool
+ multi:
+ type: bool
+ disabled:
+ type: bool
+ hidden:
+ type: bool
+ help:
+ type: str
+ description:
+ type: str
type:
type: str
enum:
- - "string"
- "number"
- - "nil"
- - "space"
+ - "float"
+ - "string"
+ - "password"
+ - "secret"
+ - "mail"
- "boolean"
- name:
- type: str
- test:
- type: str
- supplier:
- type: str
- provider:
- type: str
- remove_fill:
- type: bool
- remove_condition:
- type: bool
- remove_check:
- type: bool
- remove_choice:
- type: bool
- mode:
- type: str
- auto_save:
- type: bool
- auto_freeze:
- type: bool
- mandatory:
- type: bool
- exists:
- type: bool
- redefine:
- type: bool
- unique:
- type: bool
- multi:
- type: bool
- disabled:
- type: bool
- hidden:
- type: bool
- help:
- type: str
- description:
- type: str
- type:
- type: str
- enum:
- - "number"
- - "float"
- - "string"
- - "password"
- - "secret"
- - "mail"
- - "boolean"
- - "filename"
- - "date"
- - "unix_user"
- - "ip"
- - "local_ip"
- - "netmask"
- - "network"
- - "broadcast"
- - "netbios"
- - "domainname"
- - "hostname"
- - "web_address"
- - "port"
- - "mac"
- - "cidr"
- - "network_cidr"
- - "choice"
- family:
- type: map
- mapping:
- variable:
- required: false
- type: map
- mapping:
- choice:
- required: false
- type: seq
- sequence:
- - type: map
- mapping:
- text:
- required: false
- type: any
- param:
- required: false
- type: seq
- sequence:
- - type: map
- mapping:
- text:
- required: false
- type: any
- type:
- type: str
- enum:
- - "string"
- - "number"
- - "nil"
- - "space"
- - "boolean"
- - "variable"
- - "function"
- - "information"
- - "target_information"
- - "suffix"
- - "index"
- optional:
- type: bool
- propertyerror:
- type: bool
- name:
- type: str
- type:
- type: str
- enum:
- - "string"
- - "number"
- - "nil"
- - "space"
- - "boolean"
- - "function"
- - "variable"
- name:
- type: str
- value:
- required: false
- type: seq
- sequence:
- - type: map
- mapping:
- text:
- required: false
- type: any
- type:
- type: str
- enum:
- - "string"
- - "number"
- - "nil"
- - "space"
- - "boolean"
- name:
- type: str
- test:
- type: str
- supplier:
- type: str
- provider:
- type: str
- remove_fill:
- type: bool
- remove_condition:
- type: bool
- remove_check:
- type: bool
- remove_choice:
- type: bool
- mode:
- type: str
- auto_save:
- type: bool
- auto_freeze:
- type: bool
- mandatory:
- type: bool
- exists:
- type: bool
- redefine:
- type: bool
- unique:
- type: bool
- multi:
- type: bool
- disabled:
- type: bool
- hidden:
- type: bool
- help:
- type: str
- description:
- type: str
- type:
- type: str
- enum:
- - "number"
- - "float"
- - "string"
- - "password"
- - "secret"
- - "mail"
- - "boolean"
- - "filename"
- - "date"
- - "unix_user"
- - "ip"
- - "local_ip"
- - "netmask"
- - "network"
- - "broadcast"
- - "netbios"
- - "domainname"
- - "hostname"
- - "web_address"
- - "port"
- - "mac"
- - "cidr"
- - "network_cidr"
- - "choice"
+ - "filename"
+ - "date"
+ - "unix_user"
+ - "ip"
+ - "local_ip"
+ - "netmask"
+ - "network"
+ - "broadcast"
+ - "netbios"
+ - "domainname"
+ - "hostname"
+ - "web_address"
+ - "port"
+ - "mac"
+ - "cidr"
+ - "network_cidr"
+ - "choice"
family:
- required: false
- name:
- type: str
- leadership:
- type: bool
- dynamic:
- type: str
- hidden:
- type: bool
- mode:
- type: str
- help:
- type: str
- description:
- type: str
- variables:
type: seq
sequence:
- type: map
mapping:
variable:
- type: map
- mapping:
- choice:
- required: false
- type: seq
- sequence:
- - type: map
- mapping:
- text:
- required: false
- type: any
- param:
- required: false
- type: seq
- sequence:
- - type: map
- mapping:
- text:
- required: false
- type: any
- type:
- type: str
- enum:
- - "string"
- - "number"
- - "nil"
- - "space"
- - "boolean"
- - "variable"
- - "function"
- - "information"
- - "target_information"
- - "suffix"
- - "index"
- optional:
- type: bool
- propertyerror:
- type: bool
- name:
- type: str
- type:
- type: str
- enum:
- - "string"
- - "number"
- - "nil"
- - "space"
- - "boolean"
- - "function"
- - "variable"
- name:
- type: str
- value:
- required: false
- type: seq
- sequence:
- - type: map
- mapping:
- text:
- required: false
- type: any
- type:
- type: str
- enum:
- - "string"
- - "number"
- - "nil"
- - "space"
- - "boolean"
- name:
- type: str
- test:
- type: str
- supplier:
- type: str
- provider:
- type: str
- remove_fill:
- type: bool
- remove_condition:
- type: bool
- remove_check:
- type: bool
- remove_choice:
- type: bool
- mode:
- type: str
- auto_save:
- type: bool
- auto_freeze:
- type: bool
- mandatory:
- type: bool
- exists:
- type: bool
- redefine:
- type: bool
- unique:
- type: bool
- multi:
- type: bool
- disabled:
- type: bool
- hidden:
- type: bool
- help:
- type: str
- description:
- type: str
- type:
- type: str
- enum:
- - "number"
- - "float"
- - "string"
- - "password"
- - "secret"
- - "mail"
- - "boolean"
- - "filename"
- - "date"
- - "unix_user"
- - "ip"
- - "local_ip"
- - "netmask"
- - "network"
- - "broadcast"
- - "netbios"
- - "domainname"
- - "hostname"
- - "web_address"
- - "port"
- - "mac"
- - "cidr"
- - "network_cidr"
- - "choice"
- family:
- type: map
- mapping:
- variable:
- required: false
- type: map
+ required: false
+ type: seq
+ sequence:
+ - type: map
mapping:
choice:
required: false
@@ -1480,29 +885,31 @@ mapping:
- "cidr"
- "network_cidr"
- "choice"
- family:
- required: false
- name:
- type: str
- leadership:
- type: bool
- dynamic:
- type: str
- hidden:
- type: bool
- mode:
- type: str
- help:
- type: str
- description:
- type: str
- variables:
- type: seq
- sequence:
- - type: map
- mapping:
- variable:
- type: map
+ family:
+ required: false
+ name:
+ type: str
+ leadership:
+ type: bool
+ dynamic:
+ type: str
+ hidden:
+ type: bool
+ mode:
+ type: str
+ help:
+ type: str
+ description:
+ type: str
+ variables:
+ type: seq
+ sequence:
+ - type: map
+ mapping:
+ variable:
+ type: seq
+ sequence:
+ - type: map
mapping:
choice:
required: false
@@ -1638,147 +1045,151 @@ mapping:
- "cidr"
- "network_cidr"
- "choice"
- family:
- type: map
+ family:
+ type: seq
+ sequence:
+ - type: map
mapping:
variable:
required: false
- type: map
- mapping:
- choice:
- required: false
- type: seq
- sequence:
- - type: map
- mapping:
- text:
- required: false
- type: any
- param:
- required: false
- type: seq
- sequence:
- - type: map
- mapping:
- text:
- required: false
- type: any
- type:
- type: str
- enum:
- - "string"
- - "number"
- - "nil"
- - "space"
- - "boolean"
- - "variable"
- - "function"
- - "information"
- - "target_information"
- - "suffix"
- - "index"
- optional:
- type: bool
- propertyerror:
- type: bool
- name:
- type: str
- type:
- type: str
- enum:
- - "string"
- - "number"
- - "nil"
- - "space"
- - "boolean"
- - "function"
- - "variable"
- name:
- type: str
- value:
- required: false
- type: seq
- sequence:
- - type: map
- mapping:
- text:
- required: false
- type: any
- type:
- type: str
- enum:
- - "string"
- - "number"
- - "nil"
- - "space"
- - "boolean"
- name:
- type: str
- test:
- type: str
- supplier:
- type: str
- provider:
- type: str
- remove_fill:
- type: bool
- remove_condition:
- type: bool
- remove_check:
- type: bool
- remove_choice:
- type: bool
- mode:
- type: str
- auto_save:
- type: bool
- auto_freeze:
- type: bool
- mandatory:
- type: bool
- exists:
- type: bool
- redefine:
- type: bool
- unique:
- type: bool
- multi:
- type: bool
- disabled:
- type: bool
- hidden:
- type: bool
- help:
- type: str
- description:
- type: str
- type:
- type: str
- enum:
- - "number"
- - "float"
- - "string"
- - "password"
- - "secret"
- - "mail"
- - "boolean"
- - "filename"
- - "date"
- - "unix_user"
- - "ip"
- - "local_ip"
- - "netmask"
- - "network"
- - "broadcast"
- - "netbios"
- - "domainname"
- - "hostname"
- - "web_address"
- - "port"
- - "mac"
- - "cidr"
- - "network_cidr"
- - "choice"
+ type: seq
+ sequence:
+ - type: map
+ mapping:
+ choice:
+ required: false
+ type: seq
+ sequence:
+ - type: map
+ mapping:
+ text:
+ required: false
+ type: any
+ param:
+ required: false
+ type: seq
+ sequence:
+ - type: map
+ mapping:
+ text:
+ required: false
+ type: any
+ type:
+ type: str
+ enum:
+ - "string"
+ - "number"
+ - "nil"
+ - "space"
+ - "boolean"
+ - "variable"
+ - "function"
+ - "information"
+ - "target_information"
+ - "suffix"
+ - "index"
+ optional:
+ type: bool
+ propertyerror:
+ type: bool
+ name:
+ type: str
+ type:
+ type: str
+ enum:
+ - "string"
+ - "number"
+ - "nil"
+ - "space"
+ - "boolean"
+ - "function"
+ - "variable"
+ name:
+ type: str
+ value:
+ required: false
+ type: seq
+ sequence:
+ - type: map
+ mapping:
+ text:
+ required: false
+ type: any
+ type:
+ type: str
+ enum:
+ - "string"
+ - "number"
+ - "nil"
+ - "space"
+ - "boolean"
+ name:
+ type: str
+ test:
+ type: str
+ supplier:
+ type: str
+ provider:
+ type: str
+ remove_fill:
+ type: bool
+ remove_condition:
+ type: bool
+ remove_check:
+ type: bool
+ remove_choice:
+ type: bool
+ mode:
+ type: str
+ auto_save:
+ type: bool
+ auto_freeze:
+ type: bool
+ mandatory:
+ type: bool
+ exists:
+ type: bool
+ redefine:
+ type: bool
+ unique:
+ type: bool
+ multi:
+ type: bool
+ disabled:
+ type: bool
+ hidden:
+ type: bool
+ help:
+ type: str
+ description:
+ type: str
+ type:
+ type: str
+ enum:
+ - "number"
+ - "float"
+ - "string"
+ - "password"
+ - "secret"
+ - "mail"
+ - "boolean"
+ - "filename"
+ - "date"
+ - "unix_user"
+ - "ip"
+ - "local_ip"
+ - "netmask"
+ - "network"
+ - "broadcast"
+ - "netbios"
+ - "domainname"
+ - "hostname"
+ - "web_address"
+ - "port"
+ - "mac"
+ - "cidr"
+ - "network_cidr"
+ - "choice"
family:
required: false
name:
@@ -1801,142 +1212,144 @@ mapping:
- type: map
mapping:
variable:
- type: map
- mapping:
- choice:
- required: false
- type: seq
- sequence:
- - type: map
- mapping:
- text:
- required: false
- type: any
- param:
- required: false
- type: seq
- sequence:
- - type: map
- mapping:
- text:
- required: false
- type: any
- type:
- type: str
- enum:
- - "string"
- - "number"
- - "nil"
- - "space"
- - "boolean"
- - "variable"
- - "function"
- - "information"
- - "target_information"
- - "suffix"
- - "index"
- optional:
- type: bool
- propertyerror:
- type: bool
- name:
- type: str
- type:
- type: str
- enum:
- - "string"
- - "number"
- - "nil"
- - "space"
- - "boolean"
- - "function"
- - "variable"
- name:
- type: str
- value:
- required: false
- type: seq
- sequence:
- - type: map
- mapping:
- text:
- required: false
- type: any
- type:
- type: str
- enum:
- - "string"
- - "number"
- - "nil"
- - "space"
- - "boolean"
- name:
- type: str
- test:
- type: str
- supplier:
- type: str
- provider:
- type: str
- remove_fill:
- type: bool
- remove_condition:
- type: bool
- remove_check:
- type: bool
- remove_choice:
- type: bool
- mode:
- type: str
- auto_save:
- type: bool
- auto_freeze:
- type: bool
- mandatory:
- type: bool
- exists:
- type: bool
- redefine:
- type: bool
- unique:
- type: bool
- multi:
- type: bool
- disabled:
- type: bool
- hidden:
- type: bool
- help:
- type: str
- description:
- type: str
- type:
- type: str
- enum:
- - "number"
- - "float"
- - "string"
- - "password"
- - "secret"
- - "mail"
- - "boolean"
- - "filename"
- - "date"
- - "unix_user"
- - "ip"
- - "local_ip"
- - "netmask"
- - "network"
- - "broadcast"
- - "netbios"
- - "domainname"
- - "hostname"
- - "web_address"
- - "port"
- - "mac"
- - "cidr"
- - "network_cidr"
- - "choice"
+ type: seq
+ sequence:
+ - type: map
+ mapping:
+ choice:
+ required: false
+ type: seq
+ sequence:
+ - type: map
+ mapping:
+ text:
+ required: false
+ type: any
+ param:
+ required: false
+ type: seq
+ sequence:
+ - type: map
+ mapping:
+ text:
+ required: false
+ type: any
+ type:
+ type: str
+ enum:
+ - "string"
+ - "number"
+ - "nil"
+ - "space"
+ - "boolean"
+ - "variable"
+ - "function"
+ - "information"
+ - "target_information"
+ - "suffix"
+ - "index"
+ optional:
+ type: bool
+ propertyerror:
+ type: bool
+ name:
+ type: str
+ type:
+ type: str
+ enum:
+ - "string"
+ - "number"
+ - "nil"
+ - "space"
+ - "boolean"
+ - "function"
+ - "variable"
+ name:
+ type: str
+ value:
+ required: false
+ type: seq
+ sequence:
+ - type: map
+ mapping:
+ text:
+ required: false
+ type: any
+ type:
+ type: str
+ enum:
+ - "string"
+ - "number"
+ - "nil"
+ - "space"
+ - "boolean"
+ name:
+ type: str
+ test:
+ type: str
+ supplier:
+ type: str
+ provider:
+ type: str
+ remove_fill:
+ type: bool
+ remove_condition:
+ type: bool
+ remove_check:
+ type: bool
+ remove_choice:
+ type: bool
+ mode:
+ type: str
+ auto_save:
+ type: bool
+ auto_freeze:
+ type: bool
+ mandatory:
+ type: bool
+ exists:
+ type: bool
+ redefine:
+ type: bool
+ unique:
+ type: bool
+ multi:
+ type: bool
+ disabled:
+ type: bool
+ hidden:
+ type: bool
+ help:
+ type: str
+ description:
+ type: str
+ type:
+ type: str
+ enum:
+ - "number"
+ - "float"
+ - "string"
+ - "password"
+ - "secret"
+ - "mail"
+ - "boolean"
+ - "filename"
+ - "date"
+ - "unix_user"
+ - "ip"
+ - "local_ip"
+ - "netmask"
+ - "network"
+ - "broadcast"
+ - "netbios"
+ - "domainname"
+ - "hostname"
+ - "web_address"
+ - "port"
+ - "mac"
+ - "cidr"
+ - "network_cidr"
+ - "choice"
constraints:
required: false
type: seq
diff --git a/src/rougail/reflector.py b/src/rougail/reflector.py
index 7b85358a2..049370b49 100644
--- a/src/rougail/reflector.py
+++ b/src/rougail/reflector.py
@@ -157,16 +157,18 @@ class SubYAML:
lists = []
for dico in self.dico:
for key, value in dico.items():
- lists.append((key, [value]))
+ if not isinstance(value, list):
+ value = [value]
+ lists.append((key, value))
else:
lists = []
for key, values in self.dico.items():
if key == 'variables':
for v in values:
if 'variable' in v:
- lists.append(('variable', [v['variable']]))
+ lists.append(('variable', v['variable']))
if 'family' in v:
- lists.append(('family', [v['family']]))
+ lists.append(('family', v['family']))
else:
lists.append((key, values))
for key, values in lists:
diff --git a/src/rougail/template/base.py b/src/rougail/template/base.py
index bb37ecf5e..ccb49cdbe 100644
--- a/src/rougail/template/base.py
+++ b/src/rougail/template/base.py
@@ -32,7 +32,7 @@ from shutil import copy
import logging
from typing import Dict, Any
from subprocess import call
-from os import listdir, makedirs, getcwd, chdir, unlink, rmdir
+from os import listdir, makedirs, getcwd, chdir, unlink, rmdir, chmod
from os.path import dirname, join, isfile, isdir, abspath
diff --git a/src/rougail/template/engine/__init__.py b/src/rougail/template/engine/__init__.py
index d6cbaa550..d344dce67 100644
--- a/src/rougail/template/engine/__init__.py
+++ b/src/rougail/template/engine/__init__.py
@@ -1,4 +1,4 @@
-from . import none, creole, jinja2, creole_legacy
+from . import none, creole, jinja, creole_legacy
-__all__ = ('none', 'creole', 'jinja2', 'creole_legacy')
+__all__ = ('none', 'creole', 'jinja', 'creole_legacy')
diff --git a/src/rougail/template/engine/jinja2.py b/src/rougail/template/engine/jinja.py
similarity index 99%
rename from src/rougail/template/engine/jinja2.py
rename to src/rougail/template/engine/jinja.py
index 85728dfcd..5537dca57 100644
--- a/src/rougail/template/engine/jinja2.py
+++ b/src/rougail/template/engine/jinja.py
@@ -1,4 +1,4 @@
-"""Jinja2 engine
+"""Jinja engine
Created by:
EOLE (http://eole.orion.education.fr)
@@ -51,7 +51,7 @@ def process(filename: str,
# full path of the destination file
dir_name, template_name = filename.rsplit('/', 1)
if source is not None: # pragma: no cover
- raise TemplateError(_('source is not supported for jinja2'))
+ raise TemplateError(_('source is not supported for jinja'))
var = {}
if variable is not None:
var['rougail_variable'] = variable
diff --git a/src/rougail/template/systemd.py b/src/rougail/template/systemd.py
index b62915454..c52edd732 100644
--- a/src/rougail/template/systemd.py
+++ b/src/rougail/template/systemd.py
@@ -24,7 +24,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
"""
from typing import Dict, Any
-from os import makedirs, symlink, chmod
+from os import makedirs, symlink
from os.path import dirname, isfile, join
from ipaddress import ip_network
diff --git a/tests/dictionaries/00load_autofreeze/yml/00-base.yml b/tests/dictionaries/00load_autofreeze/yml/00-base.yml
index 46e2f524c..c42e2e729 100644
--- a/tests/dictionaries/00load_autofreeze/yml/00-base.yml
+++ b/tests/dictionaries/00load_autofreeze/yml/00-base.yml
@@ -1,12 +1,11 @@
version: '0.10'
variables:
- variable:
- name: myvar
+ - name: myvar
auto_freeze: true
value:
- text: 'no'
-- variable:
- name: server_deployed
+ - name: server_deployed
type: boolean
value:
- text: false
diff --git a/tests/dictionaries/00load_autofreezeexpert/yml/00-base.yml b/tests/dictionaries/00load_autofreezeexpert/yml/00-base.yml
index 1e1a4b0db..f1f146461 100644
--- a/tests/dictionaries/00load_autofreezeexpert/yml/00-base.yml
+++ b/tests/dictionaries/00load_autofreezeexpert/yml/00-base.yml
@@ -1,13 +1,12 @@
version: '0.10'
variables:
- variable:
- name: my_var
+ - name: my_var
auto_freeze: true
mode: expert
value:
- text: 'no'
-- variable:
- name: server_deployed
+ - name: server_deployed
type: boolean
value:
- text: false
diff --git a/tests/dictionaries/00load_autosave/yml/00-base.yml b/tests/dictionaries/00load_autosave/yml/00-base.yml
index 6f0501647..f68705312 100644
--- a/tests/dictionaries/00load_autosave/yml/00-base.yml
+++ b/tests/dictionaries/00load_autosave/yml/00-base.yml
@@ -1,14 +1,14 @@
version: '0.10'
variables:
- variable:
- name: server_deployed
+ - name: server_deployed
type: boolean
- family:
- name: general
+ - name: general
description: "g\xE9n\xE9ral"
variables:
- variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
type: string
description: No change
auto_save: true
diff --git a/tests/dictionaries/00load_autosaveexpert/yml/00-base.yml b/tests/dictionaries/00load_autosaveexpert/yml/00-base.yml
index b6ee766ad..7c6409deb 100644
--- a/tests/dictionaries/00load_autosaveexpert/yml/00-base.yml
+++ b/tests/dictionaries/00load_autosaveexpert/yml/00-base.yml
@@ -1,14 +1,14 @@
version: '0.10'
variables:
- variable:
- name: server_deployed
+ - name: server_deployed
type: boolean
- family:
- name: general
+ - name: general
description: "g\xE9n\xE9ral"
variables:
- variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
type: string
description: No change
auto_save: true
diff --git a/tests/dictionaries/00load_comment/yml/00-base.yml b/tests/dictionaries/00load_comment/yml/00-base.yml
index 9b4819ab1..862ba9941 100644
--- a/tests/dictionaries/00load_comment/yml/00-base.yml
+++ b/tests/dictionaries/00load_comment/yml/00-base.yml
@@ -1,11 +1,11 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
description: "g\xE9n\xE9ral"
variables:
- variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
type: string
description: No change
hidden: true
diff --git a/tests/dictionaries/00load_notype/yml/00-base.yml b/tests/dictionaries/00load_notype/yml/00-base.yml
index 5b826e614..57dfc3a38 100644
--- a/tests/dictionaries/00load_notype/yml/00-base.yml
+++ b/tests/dictionaries/00load_notype/yml/00-base.yml
@@ -1,17 +1,16 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
description: "g\xE9n\xE9ral"
variables:
- variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
type: string
description: No change
hidden: true
value:
- text: non
- - variable:
- name: without_type
+ - name: without_type
value:
- text: non
diff --git a/tests/dictionaries/00load_save/yml/00-base.yml b/tests/dictionaries/00load_save/yml/00-base.yml
index 9b4819ab1..862ba9941 100644
--- a/tests/dictionaries/00load_save/yml/00-base.yml
+++ b/tests/dictionaries/00load_save/yml/00-base.yml
@@ -1,11 +1,11 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
description: "g\xE9n\xE9ral"
variables:
- variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
type: string
description: No change
hidden: true
diff --git a/tests/dictionaries/00load_subfolder/yml/99-base.yml b/tests/dictionaries/00load_subfolder/yml/99-base.yml
index 9b4819ab1..862ba9941 100644
--- a/tests/dictionaries/00load_subfolder/yml/99-base.yml
+++ b/tests/dictionaries/00load_subfolder/yml/99-base.yml
@@ -1,11 +1,11 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
description: "g\xE9n\xE9ral"
variables:
- variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
type: string
description: No change
hidden: true
diff --git a/tests/dictionaries/00load_subfolder/yml/subfolder/00-base.yml b/tests/dictionaries/00load_subfolder/yml/subfolder/00-base.yml
index fe8199b1f..7a4d4babe 100644
--- a/tests/dictionaries/00load_subfolder/yml/subfolder/00-base.yml
+++ b/tests/dictionaries/00load_subfolder/yml/subfolder/00-base.yml
@@ -1,11 +1,11 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
description: "g\xE9n\xE9ral"
variables:
- variable:
- name: mode_conteneur_actif1
+ - name: mode_conteneur_actif1
type: string
description: No change
hidden: true
diff --git a/tests/dictionaries/01auto_autofreeze/yml/00-base.yml b/tests/dictionaries/01auto_autofreeze/yml/00-base.yml
index 78648c8ce..42bcf3aa8 100644
--- a/tests/dictionaries/01auto_autofreeze/yml/00-base.yml
+++ b/tests/dictionaries/01auto_autofreeze/yml/00-base.yml
@@ -1,12 +1,11 @@
version: '0.10'
variables:
- variable:
- name: server_deployed
+ - name: server_deployed
type: boolean
value:
- text: false
-- variable:
- name: my_variable
+ - name: my_variable
auto_freeze: true
hidden: true
value:
diff --git a/tests/dictionaries/01auto_base/yml/00-base.yml b/tests/dictionaries/01auto_base/yml/00-base.yml
index 9332ecc8b..affc3a7d6 100644
--- a/tests/dictionaries/01auto_base/yml/00-base.yml
+++ b/tests/dictionaries/01auto_base/yml/00-base.yml
@@ -1,17 +1,16 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
variables:
- variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
type: string
description: No change
hidden: true
value:
- text: non
- - variable:
- name: mode_conteneur_actif1
+ - name: mode_conteneur_actif1
type: string
description: No change
value:
diff --git a/tests/dictionaries/01auto_withoutparam/yml/00-base.yml b/tests/dictionaries/01auto_withoutparam/yml/00-base.yml
index 9497de50b..40821a3b6 100644
--- a/tests/dictionaries/01auto_withoutparam/yml/00-base.yml
+++ b/tests/dictionaries/01auto_withoutparam/yml/00-base.yml
@@ -1,17 +1,16 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
variables:
- variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
type: string
description: No change
hidden: true
value:
- text: non
- - variable:
- name: mode_conteneur_actif1
+ - name: mode_conteneur_actif1
type: string
description: No change
value:
diff --git a/tests/dictionaries/01base_domainname/yml/00-base.yml b/tests/dictionaries/01base_domainname/yml/00-base.yml
index b7710743e..6b67a945f 100644
--- a/tests/dictionaries/01base_domainname/yml/00-base.yml
+++ b/tests/dictionaries/01base_domainname/yml/00-base.yml
@@ -1,10 +1,10 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
variables:
- variable:
- name: domain
+ - name: domain
type: domainname
description: Description
value:
diff --git a/tests/dictionaries/01base_file/tiramisu/base.py b/tests/dictionaries/01base_file/tiramisu/base.py
index a9acf95e0..fa50e1e2d 100644
--- a/tests/dictionaries/01base_file/tiramisu/base.py
+++ b/tests/dictionaries/01base_file/tiramisu/base.py
@@ -28,7 +28,7 @@ optiondescription_5.impl_set_information('source', "file")
option_10 = FilenameOption(name="name", doc="name", default="/etc/file2")
option_9 = BoolOption(name="activate", doc="activate", default=True)
optiondescription_8 = OptionDescription(name="file2", doc="file2", children=[option_10, option_9])
-optiondescription_8.impl_set_information('engine', "jinja2")
+optiondescription_8.impl_set_information('engine', "jinja")
optiondescription_8.impl_set_information('source', "file2")
optiondescription_4 = OptionDescription(name="files", doc="files", children=[optiondescription_5, optiondescription_8])
option_3 = BoolOption(name="activate", doc="activate", default=True)
diff --git a/tests/dictionaries/01base_file/tiramisu/multi.py b/tests/dictionaries/01base_file/tiramisu/multi.py
index 35f62a28c..7b94afa39 100644
--- a/tests/dictionaries/01base_file/tiramisu/multi.py
+++ b/tests/dictionaries/01base_file/tiramisu/multi.py
@@ -28,7 +28,7 @@ optiondescription_7.impl_set_information('source', "file")
option_12 = FilenameOption(name="name", doc="name", default="/etc/file2")
option_11 = BoolOption(name="activate", doc="activate", default=True)
optiondescription_10 = OptionDescription(name="file2", doc="file2", children=[option_12, option_11])
-optiondescription_10.impl_set_information('engine', "jinja2")
+optiondescription_10.impl_set_information('engine', "jinja")
optiondescription_10.impl_set_information('source', "file2")
optiondescription_6 = OptionDescription(name="files", doc="files", children=[optiondescription_7, optiondescription_10])
option_5 = BoolOption(name="activate", doc="activate", default=True)
@@ -47,7 +47,7 @@ optiondescription_16.impl_set_information('source', "file")
option_21 = FilenameOption(name="name", doc="name", default="/etc/file2")
option_20 = BoolOption(name="activate", doc="activate", default=True)
optiondescription_19 = OptionDescription(name="file2", doc="file2", children=[option_21, option_20])
-optiondescription_19.impl_set_information('engine', "jinja2")
+optiondescription_19.impl_set_information('engine', "jinja")
optiondescription_19.impl_set_information('source', "file2")
optiondescription_15 = OptionDescription(name="files", doc="files", children=[optiondescription_16, optiondescription_19])
option_14 = BoolOption(name="activate", doc="activate", default=True)
diff --git a/tests/dictionaries/01base_file/xml/00-base.xml b/tests/dictionaries/01base_file/xml/00-base.xml
index 8cb2c47b3..4f0a28e6c 100644
--- a/tests/dictionaries/01base_file/xml/00-base.xml
+++ b/tests/dictionaries/01base_file/xml/00-base.xml
@@ -3,7 +3,7 @@
/etc/file
- /etc/file2
+ /etc/file2
diff --git a/tests/dictionaries/01base_file/yml/00-base.yml b/tests/dictionaries/01base_file/yml/00-base.yml
index 882b1c23c..66a3404f9 100644
--- a/tests/dictionaries/01base_file/yml/00-base.yml
+++ b/tests/dictionaries/01base_file/yml/00-base.yml
@@ -4,14 +4,14 @@ services:
- name: test
file:
- text: /etc/file
- - engine: jinja2
+ - engine: jinja
text: /etc/file2
variables:
- family:
- name: general
+ - name: general
variables:
- variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
type: string
description: Description
value:
diff --git a/tests/dictionaries/01base_file_disabled/tiramisu/base.py b/tests/dictionaries/01base_file_disabled/tiramisu/base.py
index 3536313a0..aa7416fec 100644
--- a/tests/dictionaries/01base_file_disabled/tiramisu/base.py
+++ b/tests/dictionaries/01base_file_disabled/tiramisu/base.py
@@ -28,7 +28,7 @@ optiondescription_5.impl_set_information('source', "file")
option_10 = FilenameOption(name="name", doc="name", default="/etc/file2")
option_9 = BoolOption(name="activate", doc="activate", default=True)
optiondescription_8 = OptionDescription(name="file2", doc="file2", children=[option_10, option_9])
-optiondescription_8.impl_set_information('engine', "jinja2")
+optiondescription_8.impl_set_information('engine', "jinja")
optiondescription_8.impl_set_information('source', "file2")
option_13 = FilenameOption(name="name", doc="name", default="/etc/file3")
option_12 = BoolOption(name="activate", doc="activate", default=False)
diff --git a/tests/dictionaries/01base_file_disabled/tiramisu/multi.py b/tests/dictionaries/01base_file_disabled/tiramisu/multi.py
index 77b69e075..741f630f7 100644
--- a/tests/dictionaries/01base_file_disabled/tiramisu/multi.py
+++ b/tests/dictionaries/01base_file_disabled/tiramisu/multi.py
@@ -28,7 +28,7 @@ optiondescription_7.impl_set_information('source', "file")
option_12 = FilenameOption(name="name", doc="name", default="/etc/file2")
option_11 = BoolOption(name="activate", doc="activate", default=True)
optiondescription_10 = OptionDescription(name="file2", doc="file2", children=[option_12, option_11])
-optiondescription_10.impl_set_information('engine', "jinja2")
+optiondescription_10.impl_set_information('engine', "jinja")
optiondescription_10.impl_set_information('source', "file2")
option_15 = FilenameOption(name="name", doc="name", default="/etc/file3")
option_14 = BoolOption(name="activate", doc="activate", default=False)
@@ -51,7 +51,7 @@ optiondescription_19.impl_set_information('source', "file")
option_24 = FilenameOption(name="name", doc="name", default="/etc/file2")
option_23 = BoolOption(name="activate", doc="activate", default=True)
optiondescription_22 = OptionDescription(name="file2", doc="file2", children=[option_24, option_23])
-optiondescription_22.impl_set_information('engine', "jinja2")
+optiondescription_22.impl_set_information('engine', "jinja")
optiondescription_22.impl_set_information('source', "file2")
option_27 = FilenameOption(name="name", doc="name", default="/etc/file3")
option_26 = BoolOption(name="activate", doc="activate", default=False)
diff --git a/tests/dictionaries/01base_file_disabled/xml/00-base.xml b/tests/dictionaries/01base_file_disabled/xml/00-base.xml
index ebd0c707c..14de25e63 100644
--- a/tests/dictionaries/01base_file_disabled/xml/00-base.xml
+++ b/tests/dictionaries/01base_file_disabled/xml/00-base.xml
@@ -3,7 +3,7 @@
/etc/file
- /etc/file2
+ /etc/file2
/etc/file3
diff --git a/tests/dictionaries/01base_file_disabled/yml/00-base.yml b/tests/dictionaries/01base_file_disabled/yml/00-base.yml
index 2206726cd..44d735e2a 100644
--- a/tests/dictionaries/01base_file_disabled/yml/00-base.yml
+++ b/tests/dictionaries/01base_file_disabled/yml/00-base.yml
@@ -4,16 +4,16 @@ services:
- name: test
file:
- text: /etc/file
- - engine: jinja2
+ - engine: jinja
text: /etc/file2
- disabled: true
text: /etc/file3
variables:
- family:
- name: general
+ - name: general
variables:
- variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
type: string
description: Description
value:
diff --git a/tests/dictionaries/01base_file_include/tiramisu/base.py b/tests/dictionaries/01base_file_include/tiramisu/base.py
index a9acf95e0..fa50e1e2d 100644
--- a/tests/dictionaries/01base_file_include/tiramisu/base.py
+++ b/tests/dictionaries/01base_file_include/tiramisu/base.py
@@ -28,7 +28,7 @@ optiondescription_5.impl_set_information('source', "file")
option_10 = FilenameOption(name="name", doc="name", default="/etc/file2")
option_9 = BoolOption(name="activate", doc="activate", default=True)
optiondescription_8 = OptionDescription(name="file2", doc="file2", children=[option_10, option_9])
-optiondescription_8.impl_set_information('engine', "jinja2")
+optiondescription_8.impl_set_information('engine', "jinja")
optiondescription_8.impl_set_information('source', "file2")
optiondescription_4 = OptionDescription(name="files", doc="files", children=[optiondescription_5, optiondescription_8])
option_3 = BoolOption(name="activate", doc="activate", default=True)
diff --git a/tests/dictionaries/01base_file_include/tiramisu/multi.py b/tests/dictionaries/01base_file_include/tiramisu/multi.py
index 35f62a28c..7b94afa39 100644
--- a/tests/dictionaries/01base_file_include/tiramisu/multi.py
+++ b/tests/dictionaries/01base_file_include/tiramisu/multi.py
@@ -28,7 +28,7 @@ optiondescription_7.impl_set_information('source', "file")
option_12 = FilenameOption(name="name", doc="name", default="/etc/file2")
option_11 = BoolOption(name="activate", doc="activate", default=True)
optiondescription_10 = OptionDescription(name="file2", doc="file2", children=[option_12, option_11])
-optiondescription_10.impl_set_information('engine', "jinja2")
+optiondescription_10.impl_set_information('engine', "jinja")
optiondescription_10.impl_set_information('source', "file2")
optiondescription_6 = OptionDescription(name="files", doc="files", children=[optiondescription_7, optiondescription_10])
option_5 = BoolOption(name="activate", doc="activate", default=True)
@@ -47,7 +47,7 @@ optiondescription_16.impl_set_information('source', "file")
option_21 = FilenameOption(name="name", doc="name", default="/etc/file2")
option_20 = BoolOption(name="activate", doc="activate", default=True)
optiondescription_19 = OptionDescription(name="file2", doc="file2", children=[option_21, option_20])
-optiondescription_19.impl_set_information('engine', "jinja2")
+optiondescription_19.impl_set_information('engine', "jinja")
optiondescription_19.impl_set_information('source', "file2")
optiondescription_15 = OptionDescription(name="files", doc="files", children=[optiondescription_16, optiondescription_19])
option_14 = BoolOption(name="activate", doc="activate", default=True)
diff --git a/tests/dictionaries/01base_file_include/xml/00-base.xml b/tests/dictionaries/01base_file_include/xml/00-base.xml
index 8cb2c47b3..4f0a28e6c 100644
--- a/tests/dictionaries/01base_file_include/xml/00-base.xml
+++ b/tests/dictionaries/01base_file_include/xml/00-base.xml
@@ -3,7 +3,7 @@
/etc/file
- /etc/file2
+ /etc/file2
diff --git a/tests/dictionaries/01base_file_include/yml/00-base.yml b/tests/dictionaries/01base_file_include/yml/00-base.yml
index 882b1c23c..66a3404f9 100644
--- a/tests/dictionaries/01base_file_include/yml/00-base.yml
+++ b/tests/dictionaries/01base_file_include/yml/00-base.yml
@@ -4,14 +4,14 @@ services:
- name: test
file:
- text: /etc/file
- - engine: jinja2
+ - engine: jinja
text: /etc/file2
variables:
- family:
- name: general
+ - name: general
variables:
- variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
type: string
description: Description
value:
diff --git a/tests/dictionaries/01base_file_include_content/tiramisu/base.py b/tests/dictionaries/01base_file_include_content/tiramisu/base.py
index f5e417b4d..1d5539ceb 100644
--- a/tests/dictionaries/01base_file_include_content/tiramisu/base.py
+++ b/tests/dictionaries/01base_file_include_content/tiramisu/base.py
@@ -28,7 +28,7 @@ optiondescription_5.impl_set_information('source', "file")
option_10 = FilenameOption(name="name", doc="name", default="/etc/file2")
option_9 = BoolOption(name="activate", doc="activate", default=True)
optiondescription_8 = OptionDescription(name="file2", doc="file2", children=[option_10, option_9])
-optiondescription_8.impl_set_information('engine', "jinja2")
+optiondescription_8.impl_set_information('engine', "jinja")
optiondescription_8.impl_set_information('source', "file2")
option_13 = FilenameOption(name="name", doc="name", default="/etc/dir/incfile")
option_12 = BoolOption(name="activate", doc="activate", default=True)
diff --git a/tests/dictionaries/01base_file_include_content/tiramisu/multi.py b/tests/dictionaries/01base_file_include_content/tiramisu/multi.py
index 3c3fbd45f..410e3b78c 100644
--- a/tests/dictionaries/01base_file_include_content/tiramisu/multi.py
+++ b/tests/dictionaries/01base_file_include_content/tiramisu/multi.py
@@ -28,7 +28,7 @@ optiondescription_7.impl_set_information('source', "file")
option_12 = FilenameOption(name="name", doc="name", default="/etc/file2")
option_11 = BoolOption(name="activate", doc="activate", default=True)
optiondescription_10 = OptionDescription(name="file2", doc="file2", children=[option_12, option_11])
-optiondescription_10.impl_set_information('engine', "jinja2")
+optiondescription_10.impl_set_information('engine', "jinja")
optiondescription_10.impl_set_information('source', "file2")
option_15 = FilenameOption(name="name", doc="name", default="/etc/dir/incfile")
option_14 = BoolOption(name="activate", doc="activate", default=True)
@@ -52,7 +52,7 @@ optiondescription_19.impl_set_information('source', "file")
option_24 = FilenameOption(name="name", doc="name", default="/etc/file2")
option_23 = BoolOption(name="activate", doc="activate", default=True)
optiondescription_22 = OptionDescription(name="file2", doc="file2", children=[option_24, option_23])
-optiondescription_22.impl_set_information('engine', "jinja2")
+optiondescription_22.impl_set_information('engine', "jinja")
optiondescription_22.impl_set_information('source', "file2")
option_27 = FilenameOption(name="name", doc="name", default="/etc/dir/incfile")
option_26 = BoolOption(name="activate", doc="activate", default=True)
diff --git a/tests/dictionaries/01base_file_include_content/xml/00-base.xml b/tests/dictionaries/01base_file_include_content/xml/00-base.xml
index 2a038b2ee..4bc32e479 100644
--- a/tests/dictionaries/01base_file_include_content/xml/00-base.xml
+++ b/tests/dictionaries/01base_file_include_content/xml/00-base.xml
@@ -3,7 +3,7 @@
/etc/file
- /etc/file2
+ /etc/file2
/etc/dir/incfile
diff --git a/tests/dictionaries/01base_file_include_content/yml/00-base.yml b/tests/dictionaries/01base_file_include_content/yml/00-base.yml
index b15ac68b0..2827c17bb 100644
--- a/tests/dictionaries/01base_file_include_content/yml/00-base.yml
+++ b/tests/dictionaries/01base_file_include_content/yml/00-base.yml
@@ -4,16 +4,16 @@ services:
- name: test
file:
- text: /etc/file
- - engine: jinja2
+ - engine: jinja
text: /etc/file2
- included: content
text: /etc/dir/incfile
variables:
- family:
- name: general
+ - name: general
variables:
- variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
type: string
description: Description
value:
diff --git a/tests/dictionaries/01base_file_include_name/tiramisu/base.py b/tests/dictionaries/01base_file_include_name/tiramisu/base.py
index 577a2dbff..d07a999cc 100644
--- a/tests/dictionaries/01base_file_include_name/tiramisu/base.py
+++ b/tests/dictionaries/01base_file_include_name/tiramisu/base.py
@@ -28,7 +28,7 @@ optiondescription_5.impl_set_information('source', "file")
option_10 = FilenameOption(name="name", doc="name", default="/etc/file2")
option_9 = BoolOption(name="activate", doc="activate", default=True)
optiondescription_8 = OptionDescription(name="file2", doc="file2", children=[option_10, option_9])
-optiondescription_8.impl_set_information('engine', "jinja2")
+optiondescription_8.impl_set_information('engine', "jinja")
optiondescription_8.impl_set_information('source', "file2")
option_13 = FilenameOption(name="name", doc="name", default="/etc/dir/incfile")
option_12 = BoolOption(name="activate", doc="activate", default=True)
diff --git a/tests/dictionaries/01base_file_include_name/tiramisu/multi.py b/tests/dictionaries/01base_file_include_name/tiramisu/multi.py
index 9dcb184f2..3a09c16dc 100644
--- a/tests/dictionaries/01base_file_include_name/tiramisu/multi.py
+++ b/tests/dictionaries/01base_file_include_name/tiramisu/multi.py
@@ -28,7 +28,7 @@ optiondescription_7.impl_set_information('source', "file")
option_12 = FilenameOption(name="name", doc="name", default="/etc/file2")
option_11 = BoolOption(name="activate", doc="activate", default=True)
optiondescription_10 = OptionDescription(name="file2", doc="file2", children=[option_12, option_11])
-optiondescription_10.impl_set_information('engine', "jinja2")
+optiondescription_10.impl_set_information('engine', "jinja")
optiondescription_10.impl_set_information('source', "file2")
option_15 = FilenameOption(name="name", doc="name", default="/etc/dir/incfile")
option_14 = BoolOption(name="activate", doc="activate", default=True)
@@ -52,7 +52,7 @@ optiondescription_19.impl_set_information('source', "file")
option_24 = FilenameOption(name="name", doc="name", default="/etc/file2")
option_23 = BoolOption(name="activate", doc="activate", default=True)
optiondescription_22 = OptionDescription(name="file2", doc="file2", children=[option_24, option_23])
-optiondescription_22.impl_set_information('engine', "jinja2")
+optiondescription_22.impl_set_information('engine', "jinja")
optiondescription_22.impl_set_information('source', "file2")
option_27 = FilenameOption(name="name", doc="name", default="/etc/dir/incfile")
option_26 = BoolOption(name="activate", doc="activate", default=True)
diff --git a/tests/dictionaries/01base_file_include_name/xml/00-base.xml b/tests/dictionaries/01base_file_include_name/xml/00-base.xml
index 1bc14b599..f55bdf7d5 100644
--- a/tests/dictionaries/01base_file_include_name/xml/00-base.xml
+++ b/tests/dictionaries/01base_file_include_name/xml/00-base.xml
@@ -3,7 +3,7 @@
/etc/file
- /etc/file2
+ /etc/file2
/etc/dir/incfile
diff --git a/tests/dictionaries/01base_file_include_name/yml/00-base.yml b/tests/dictionaries/01base_file_include_name/yml/00-base.yml
index 80ccc1d7a..c92eb1619 100644
--- a/tests/dictionaries/01base_file_include_name/yml/00-base.yml
+++ b/tests/dictionaries/01base_file_include_name/yml/00-base.yml
@@ -4,16 +4,16 @@ services:
- name: test
file:
- text: /etc/file
- - engine: jinja2
+ - engine: jinja
text: /etc/file2
- included: name
text: /etc/dir/incfile
variables:
- family:
- name: general
+ - name: general
variables:
- variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
type: string
description: Description
value:
diff --git a/tests/dictionaries/01base_file_owner/tiramisu/base.py b/tests/dictionaries/01base_file_owner/tiramisu/base.py
index 14686b0bd..6d664ab88 100644
--- a/tests/dictionaries/01base_file_owner/tiramisu/base.py
+++ b/tests/dictionaries/01base_file_owner/tiramisu/base.py
@@ -32,7 +32,7 @@ option_13 = FilenameOption(name="name", doc="name", default="/etc/file2")
option_14 = UsernameOption(name="owner", doc="owner", default="nobody")
option_11 = BoolOption(name="activate", doc="activate", default=True)
optiondescription_10 = OptionDescription(name="file2", doc="file2", children=[option_12, option_13, option_14, option_11])
-optiondescription_10.impl_set_information('engine', "jinja2")
+optiondescription_10.impl_set_information('engine', "jinja")
optiondescription_10.impl_set_information('source', "file2")
optiondescription_4 = OptionDescription(name="files", doc="files", children=[optiondescription_5, optiondescription_10])
option_3 = BoolOption(name="activate", doc="activate", default=True)
diff --git a/tests/dictionaries/01base_file_owner/tiramisu/multi.py b/tests/dictionaries/01base_file_owner/tiramisu/multi.py
index 8b83e6062..6b849324d 100644
--- a/tests/dictionaries/01base_file_owner/tiramisu/multi.py
+++ b/tests/dictionaries/01base_file_owner/tiramisu/multi.py
@@ -32,7 +32,7 @@ option_15 = FilenameOption(name="name", doc="name", default="/etc/file2")
option_16 = UsernameOption(name="owner", doc="owner", default="nobody")
option_13 = BoolOption(name="activate", doc="activate", default=True)
optiondescription_12 = OptionDescription(name="file2", doc="file2", children=[option_14, option_15, option_16, option_13])
-optiondescription_12.impl_set_information('engine', "jinja2")
+optiondescription_12.impl_set_information('engine', "jinja")
optiondescription_12.impl_set_information('source', "file2")
optiondescription_6 = OptionDescription(name="files", doc="files", children=[optiondescription_7, optiondescription_12])
option_5 = BoolOption(name="activate", doc="activate", default=True)
@@ -55,7 +55,7 @@ option_28 = FilenameOption(name="name", doc="name", default="/etc/file2")
option_29 = UsernameOption(name="owner", doc="owner", default="nobody")
option_26 = BoolOption(name="activate", doc="activate", default=True)
optiondescription_25 = OptionDescription(name="file2", doc="file2", children=[option_27, option_28, option_29, option_26])
-optiondescription_25.impl_set_information('engine', "jinja2")
+optiondescription_25.impl_set_information('engine', "jinja")
optiondescription_25.impl_set_information('source', "file2")
optiondescription_19 = OptionDescription(name="files", doc="files", children=[optiondescription_20, optiondescription_25])
option_18 = BoolOption(name="activate", doc="activate", default=True)
diff --git a/tests/dictionaries/01base_file_owner/xml/00-base.xml b/tests/dictionaries/01base_file_owner/xml/00-base.xml
index 2c622d2a4..0238d8c45 100644
--- a/tests/dictionaries/01base_file_owner/xml/00-base.xml
+++ b/tests/dictionaries/01base_file_owner/xml/00-base.xml
@@ -3,7 +3,7 @@
/etc/file
- /etc/file2
+ /etc/file2
diff --git a/tests/dictionaries/01base_file_owner/yml/00-base.yml b/tests/dictionaries/01base_file_owner/yml/00-base.yml
index eba9ae637..00d2b9236 100644
--- a/tests/dictionaries/01base_file_owner/yml/00-base.yml
+++ b/tests/dictionaries/01base_file_owner/yml/00-base.yml
@@ -8,14 +8,14 @@ services:
text: /etc/file
- owner: nobody
group: nobody
- engine: jinja2
+ engine: jinja
text: /etc/file2
variables:
- family:
- name: general
+ - name: general
variables:
- variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
type: string
description: Description
value:
diff --git a/tests/dictionaries/01base_file_owner_variable/tiramisu/base.py b/tests/dictionaries/01base_file_owner_variable/tiramisu/base.py
index 06bd03888..b1f050f6f 100644
--- a/tests/dictionaries/01base_file_owner_variable/tiramisu/base.py
+++ b/tests/dictionaries/01base_file_owner_variable/tiramisu/base.py
@@ -34,7 +34,7 @@ option_15 = FilenameOption(name="name", doc="name", default="/etc/file2")
option_16 = SymLinkOption(name="owner", opt=option_3)
option_13 = BoolOption(name="activate", doc="activate", default=True)
optiondescription_12 = OptionDescription(name="file2", doc="file2", children=[option_14, option_15, option_16, option_13])
-optiondescription_12.impl_set_information('engine', "jinja2")
+optiondescription_12.impl_set_information('engine', "jinja")
optiondescription_12.impl_set_information('source', "file2")
optiondescription_6 = OptionDescription(name="files", doc="files", children=[optiondescription_7, optiondescription_12])
option_5 = BoolOption(name="activate", doc="activate", default=True)
diff --git a/tests/dictionaries/01base_file_owner_variable/tiramisu/multi.py b/tests/dictionaries/01base_file_owner_variable/tiramisu/multi.py
index 13822037f..5d5669919 100644
--- a/tests/dictionaries/01base_file_owner_variable/tiramisu/multi.py
+++ b/tests/dictionaries/01base_file_owner_variable/tiramisu/multi.py
@@ -34,7 +34,7 @@ option_19 = FilenameOption(name="name", doc="name", default="/etc/file2")
option_20 = SymLinkOption(name="owner", opt=option_3)
option_17 = BoolOption(name="activate", doc="activate", default=True)
optiondescription_16 = OptionDescription(name="file2", doc="file2", children=[option_18, option_19, option_20, option_17])
-optiondescription_16.impl_set_information('engine', "jinja2")
+optiondescription_16.impl_set_information('engine', "jinja")
optiondescription_16.impl_set_information('source', "file2")
optiondescription_10 = OptionDescription(name="files", doc="files", children=[optiondescription_11, optiondescription_16])
option_9 = BoolOption(name="activate", doc="activate", default=True)
@@ -59,7 +59,7 @@ option_32 = FilenameOption(name="name", doc="name", default="/etc/file2")
option_33 = SymLinkOption(name="owner", opt=option_7)
option_30 = BoolOption(name="activate", doc="activate", default=True)
optiondescription_29 = OptionDescription(name="file2", doc="file2", children=[option_31, option_32, option_33, option_30])
-optiondescription_29.impl_set_information('engine', "jinja2")
+optiondescription_29.impl_set_information('engine', "jinja")
optiondescription_29.impl_set_information('source', "file2")
optiondescription_23 = OptionDescription(name="files", doc="files", children=[optiondescription_24, optiondescription_29])
option_22 = BoolOption(name="activate", doc="activate", default=True)
diff --git a/tests/dictionaries/01base_file_owner_variable/xml/00-base.xml b/tests/dictionaries/01base_file_owner_variable/xml/00-base.xml
index 78a211db4..023aec7a2 100644
--- a/tests/dictionaries/01base_file_owner_variable/xml/00-base.xml
+++ b/tests/dictionaries/01base_file_owner_variable/xml/00-base.xml
@@ -3,7 +3,7 @@
/etc/file
- /etc/file2
+ /etc/file2
diff --git a/tests/dictionaries/01base_file_owner_variable/yml/00-base.yml b/tests/dictionaries/01base_file_owner_variable/yml/00-base.yml
index ea92ee6d1..41e85bea9 100644
--- a/tests/dictionaries/01base_file_owner_variable/yml/00-base.yml
+++ b/tests/dictionaries/01base_file_owner_variable/yml/00-base.yml
@@ -12,25 +12,23 @@ services:
owner: owner
group_type: variable
group: group
- engine: jinja2
+ engine: jinja
text: /etc/file2
variables:
- family:
- name: general
+ - name: general
variables:
- variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
type: string
description: Description
value:
- text: non
- - variable:
- name: owner
+ - name: owner
type: unix_user
value:
- text: nobody
- - variable:
- name: group
+ - name: group
type: unix_user
value:
- text: nobody
diff --git a/tests/dictionaries/01base_file_patch/tiramisu/base.py b/tests/dictionaries/01base_file_patch/tiramisu/base.py
index a9acf95e0..fa50e1e2d 100644
--- a/tests/dictionaries/01base_file_patch/tiramisu/base.py
+++ b/tests/dictionaries/01base_file_patch/tiramisu/base.py
@@ -28,7 +28,7 @@ optiondescription_5.impl_set_information('source', "file")
option_10 = FilenameOption(name="name", doc="name", default="/etc/file2")
option_9 = BoolOption(name="activate", doc="activate", default=True)
optiondescription_8 = OptionDescription(name="file2", doc="file2", children=[option_10, option_9])
-optiondescription_8.impl_set_information('engine', "jinja2")
+optiondescription_8.impl_set_information('engine', "jinja")
optiondescription_8.impl_set_information('source', "file2")
optiondescription_4 = OptionDescription(name="files", doc="files", children=[optiondescription_5, optiondescription_8])
option_3 = BoolOption(name="activate", doc="activate", default=True)
diff --git a/tests/dictionaries/01base_file_patch/tiramisu/multi.py b/tests/dictionaries/01base_file_patch/tiramisu/multi.py
index 35f62a28c..7b94afa39 100644
--- a/tests/dictionaries/01base_file_patch/tiramisu/multi.py
+++ b/tests/dictionaries/01base_file_patch/tiramisu/multi.py
@@ -28,7 +28,7 @@ optiondescription_7.impl_set_information('source', "file")
option_12 = FilenameOption(name="name", doc="name", default="/etc/file2")
option_11 = BoolOption(name="activate", doc="activate", default=True)
optiondescription_10 = OptionDescription(name="file2", doc="file2", children=[option_12, option_11])
-optiondescription_10.impl_set_information('engine', "jinja2")
+optiondescription_10.impl_set_information('engine', "jinja")
optiondescription_10.impl_set_information('source', "file2")
optiondescription_6 = OptionDescription(name="files", doc="files", children=[optiondescription_7, optiondescription_10])
option_5 = BoolOption(name="activate", doc="activate", default=True)
@@ -47,7 +47,7 @@ optiondescription_16.impl_set_information('source', "file")
option_21 = FilenameOption(name="name", doc="name", default="/etc/file2")
option_20 = BoolOption(name="activate", doc="activate", default=True)
optiondescription_19 = OptionDescription(name="file2", doc="file2", children=[option_21, option_20])
-optiondescription_19.impl_set_information('engine', "jinja2")
+optiondescription_19.impl_set_information('engine', "jinja")
optiondescription_19.impl_set_information('source', "file2")
optiondescription_15 = OptionDescription(name="files", doc="files", children=[optiondescription_16, optiondescription_19])
option_14 = BoolOption(name="activate", doc="activate", default=True)
diff --git a/tests/dictionaries/01base_file_patch/xml/00-base.xml b/tests/dictionaries/01base_file_patch/xml/00-base.xml
index 8cb2c47b3..4f0a28e6c 100644
--- a/tests/dictionaries/01base_file_patch/xml/00-base.xml
+++ b/tests/dictionaries/01base_file_patch/xml/00-base.xml
@@ -3,7 +3,7 @@
/etc/file
- /etc/file2
+ /etc/file2
diff --git a/tests/dictionaries/01base_file_patch/yml/00-base.yml b/tests/dictionaries/01base_file_patch/yml/00-base.yml
index 882b1c23c..66a3404f9 100644
--- a/tests/dictionaries/01base_file_patch/yml/00-base.yml
+++ b/tests/dictionaries/01base_file_patch/yml/00-base.yml
@@ -4,14 +4,14 @@ services:
- name: test
file:
- text: /etc/file
- - engine: jinja2
+ - engine: jinja
text: /etc/file2
variables:
- family:
- name: general
+ - name: general
variables:
- variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
type: string
description: Description
value:
diff --git a/tests/dictionaries/01base_file_tmpfile_dest_dir/tiramisu/base.py b/tests/dictionaries/01base_file_tmpfile_dest_dir/tiramisu/base.py
index a9acf95e0..fa50e1e2d 100644
--- a/tests/dictionaries/01base_file_tmpfile_dest_dir/tiramisu/base.py
+++ b/tests/dictionaries/01base_file_tmpfile_dest_dir/tiramisu/base.py
@@ -28,7 +28,7 @@ optiondescription_5.impl_set_information('source', "file")
option_10 = FilenameOption(name="name", doc="name", default="/etc/file2")
option_9 = BoolOption(name="activate", doc="activate", default=True)
optiondescription_8 = OptionDescription(name="file2", doc="file2", children=[option_10, option_9])
-optiondescription_8.impl_set_information('engine', "jinja2")
+optiondescription_8.impl_set_information('engine', "jinja")
optiondescription_8.impl_set_information('source', "file2")
optiondescription_4 = OptionDescription(name="files", doc="files", children=[optiondescription_5, optiondescription_8])
option_3 = BoolOption(name="activate", doc="activate", default=True)
diff --git a/tests/dictionaries/01base_file_tmpfile_dest_dir/tiramisu/multi.py b/tests/dictionaries/01base_file_tmpfile_dest_dir/tiramisu/multi.py
index 35f62a28c..7b94afa39 100644
--- a/tests/dictionaries/01base_file_tmpfile_dest_dir/tiramisu/multi.py
+++ b/tests/dictionaries/01base_file_tmpfile_dest_dir/tiramisu/multi.py
@@ -28,7 +28,7 @@ optiondescription_7.impl_set_information('source', "file")
option_12 = FilenameOption(name="name", doc="name", default="/etc/file2")
option_11 = BoolOption(name="activate", doc="activate", default=True)
optiondescription_10 = OptionDescription(name="file2", doc="file2", children=[option_12, option_11])
-optiondescription_10.impl_set_information('engine', "jinja2")
+optiondescription_10.impl_set_information('engine', "jinja")
optiondescription_10.impl_set_information('source', "file2")
optiondescription_6 = OptionDescription(name="files", doc="files", children=[optiondescription_7, optiondescription_10])
option_5 = BoolOption(name="activate", doc="activate", default=True)
@@ -47,7 +47,7 @@ optiondescription_16.impl_set_information('source', "file")
option_21 = FilenameOption(name="name", doc="name", default="/etc/file2")
option_20 = BoolOption(name="activate", doc="activate", default=True)
optiondescription_19 = OptionDescription(name="file2", doc="file2", children=[option_21, option_20])
-optiondescription_19.impl_set_information('engine', "jinja2")
+optiondescription_19.impl_set_information('engine', "jinja")
optiondescription_19.impl_set_information('source', "file2")
optiondescription_15 = OptionDescription(name="files", doc="files", children=[optiondescription_16, optiondescription_19])
option_14 = BoolOption(name="activate", doc="activate", default=True)
diff --git a/tests/dictionaries/01base_file_tmpfile_dest_dir/xml/00-base.xml b/tests/dictionaries/01base_file_tmpfile_dest_dir/xml/00-base.xml
index 8cb2c47b3..4f0a28e6c 100644
--- a/tests/dictionaries/01base_file_tmpfile_dest_dir/xml/00-base.xml
+++ b/tests/dictionaries/01base_file_tmpfile_dest_dir/xml/00-base.xml
@@ -3,7 +3,7 @@
/etc/file
- /etc/file2
+ /etc/file2
diff --git a/tests/dictionaries/01base_file_tmpfile_dest_dir/yml/00-base.yml b/tests/dictionaries/01base_file_tmpfile_dest_dir/yml/00-base.yml
index 882b1c23c..66a3404f9 100644
--- a/tests/dictionaries/01base_file_tmpfile_dest_dir/yml/00-base.yml
+++ b/tests/dictionaries/01base_file_tmpfile_dest_dir/yml/00-base.yml
@@ -4,14 +4,14 @@ services:
- name: test
file:
- text: /etc/file
- - engine: jinja2
+ - engine: jinja
text: /etc/file2
variables:
- family:
- name: general
+ - name: general
variables:
- variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
type: string
description: Description
value:
diff --git a/tests/dictionaries/01base_file_utfchar/tiramisu/base.py b/tests/dictionaries/01base_file_utfchar/tiramisu/base.py
index ef69a9376..6030b60c2 100644
--- a/tests/dictionaries/01base_file_utfchar/tiramisu/base.py
+++ b/tests/dictionaries/01base_file_utfchar/tiramisu/base.py
@@ -28,7 +28,7 @@ optiondescription_5.impl_set_information('source', "systemd-makefs@dev-disk-by\\
option_10 = FilenameOption(name="name", doc="name", default="/etc/systemd-makefs@dev-disk-by\\x2dpartlabel2")
option_9 = BoolOption(name="activate", doc="activate", default=True)
optiondescription_8 = OptionDescription(name="systemd_makefs@dev_disk_by\\x2dpartlabel2", doc="systemd-makefs@dev-disk-by\\x2dpartlabel2", children=[option_10, option_9])
-optiondescription_8.impl_set_information('engine', "jinja2")
+optiondescription_8.impl_set_information('engine', "jinja")
optiondescription_8.impl_set_information('source', "systemd-makefs@dev-disk-by\\x2dpartlabel2")
optiondescription_4 = OptionDescription(name="files", doc="files", children=[optiondescription_5, optiondescription_8])
option_3 = BoolOption(name="activate", doc="activate", default=True)
diff --git a/tests/dictionaries/01base_file_utfchar/tiramisu/multi.py b/tests/dictionaries/01base_file_utfchar/tiramisu/multi.py
index 915411982..30609914c 100644
--- a/tests/dictionaries/01base_file_utfchar/tiramisu/multi.py
+++ b/tests/dictionaries/01base_file_utfchar/tiramisu/multi.py
@@ -28,7 +28,7 @@ optiondescription_7.impl_set_information('source', "systemd-makefs@dev-disk-by\\
option_12 = FilenameOption(name="name", doc="name", default="/etc/systemd-makefs@dev-disk-by\\x2dpartlabel2")
option_11 = BoolOption(name="activate", doc="activate", default=True)
optiondescription_10 = OptionDescription(name="systemd_makefs@dev_disk_by\\x2dpartlabel2", doc="systemd-makefs@dev-disk-by\\x2dpartlabel2", children=[option_12, option_11])
-optiondescription_10.impl_set_information('engine', "jinja2")
+optiondescription_10.impl_set_information('engine', "jinja")
optiondescription_10.impl_set_information('source', "systemd-makefs@dev-disk-by\\x2dpartlabel2")
optiondescription_6 = OptionDescription(name="files", doc="files", children=[optiondescription_7, optiondescription_10])
option_5 = BoolOption(name="activate", doc="activate", default=True)
@@ -47,7 +47,7 @@ optiondescription_16.impl_set_information('source', "systemd-makefs@dev-disk-by\
option_21 = FilenameOption(name="name", doc="name", default="/etc/systemd-makefs@dev-disk-by\\x2dpartlabel2")
option_20 = BoolOption(name="activate", doc="activate", default=True)
optiondescription_19 = OptionDescription(name="systemd_makefs@dev_disk_by\\x2dpartlabel2", doc="systemd-makefs@dev-disk-by\\x2dpartlabel2", children=[option_21, option_20])
-optiondescription_19.impl_set_information('engine', "jinja2")
+optiondescription_19.impl_set_information('engine', "jinja")
optiondescription_19.impl_set_information('source', "systemd-makefs@dev-disk-by\\x2dpartlabel2")
optiondescription_15 = OptionDescription(name="files", doc="files", children=[optiondescription_16, optiondescription_19])
option_14 = BoolOption(name="activate", doc="activate", default=True)
diff --git a/tests/dictionaries/01base_file_utfchar/xml/00-base.xml b/tests/dictionaries/01base_file_utfchar/xml/00-base.xml
index 15d4233e0..092c50912 100644
--- a/tests/dictionaries/01base_file_utfchar/xml/00-base.xml
+++ b/tests/dictionaries/01base_file_utfchar/xml/00-base.xml
@@ -3,7 +3,7 @@
/etc/systemd-makefs@dev-disk-by\x2dpartlabel
- /etc/systemd-makefs@dev-disk-by\x2dpartlabel2
+ /etc/systemd-makefs@dev-disk-by\x2dpartlabel2
diff --git a/tests/dictionaries/01base_file_utfchar/yml/00-base.yml b/tests/dictionaries/01base_file_utfchar/yml/00-base.yml
index f6dc7b790..a539d8472 100644
--- a/tests/dictionaries/01base_file_utfchar/yml/00-base.yml
+++ b/tests/dictionaries/01base_file_utfchar/yml/00-base.yml
@@ -4,14 +4,14 @@ services:
- name: test
file:
- text: /etc/systemd-makefs@dev-disk-by\x2dpartlabel
- - engine: jinja2
+ - engine: jinja
text: /etc/systemd-makefs@dev-disk-by\x2dpartlabel2
variables:
- family:
- name: general
+ - name: general
variables:
- variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
type: string
description: Description
value:
diff --git a/tests/dictionaries/01base_float/yml/00-base.yml b/tests/dictionaries/01base_float/yml/00-base.yml
index bc1632254..4d8be7c00 100644
--- a/tests/dictionaries/01base_float/yml/00-base.yml
+++ b/tests/dictionaries/01base_float/yml/00-base.yml
@@ -1,16 +1,15 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
variables:
- variable:
- name: float
+ - name: float
type: float
description: Description
value:
- text: 0.527
- - variable:
- name: float_multi
+ - name: float_multi
type: float
description: Description
multi: true
diff --git a/tests/dictionaries/01base_help_quote/yml/00-base.yml b/tests/dictionaries/01base_help_quote/yml/00-base.yml
index d7e825d99..854057c0a 100644
--- a/tests/dictionaries/01base_help_quote/yml/00-base.yml
+++ b/tests/dictionaries/01base_help_quote/yml/00-base.yml
@@ -1,15 +1,14 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
variables:
- variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
type: string
description: Redefine description
help: message with '
- - variable:
- name: mode_conteneur_actif1
+ - name: mode_conteneur_actif1
type: string
description: Redefine description
help: message with "
diff --git a/tests/dictionaries/01base_multi/yml/00-base.yml b/tests/dictionaries/01base_multi/yml/00-base.yml
index 55fe081c6..fcf4de66e 100644
--- a/tests/dictionaries/01base_multi/yml/00-base.yml
+++ b/tests/dictionaries/01base_multi/yml/00-base.yml
@@ -1,10 +1,10 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
variables:
- variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
type: string
description: Redefine description
hidden: true
diff --git a/tests/dictionaries/01base_multi_notuniq/yml/00-base.yml b/tests/dictionaries/01base_multi_notuniq/yml/00-base.yml
index 2daf1aeae..5a412f602 100644
--- a/tests/dictionaries/01base_multi_notuniq/yml/00-base.yml
+++ b/tests/dictionaries/01base_multi_notuniq/yml/00-base.yml
@@ -1,10 +1,10 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
variables:
- variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
type: string
description: Redefine description
hidden: true
diff --git a/tests/dictionaries/01base_multi_uniq/yml/00-base.yml b/tests/dictionaries/01base_multi_uniq/yml/00-base.yml
index 2cbd70e4c..347045a07 100644
--- a/tests/dictionaries/01base_multi_uniq/yml/00-base.yml
+++ b/tests/dictionaries/01base_multi_uniq/yml/00-base.yml
@@ -1,10 +1,10 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
variables:
- variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
type: string
description: Redefine description
hidden: true
diff --git a/tests/dictionaries/01base_provider/yml/00-base.yml b/tests/dictionaries/01base_provider/yml/00-base.yml
index 09ac003dd..112208389 100644
--- a/tests/dictionaries/01base_provider/yml/00-base.yml
+++ b/tests/dictionaries/01base_provider/yml/00-base.yml
@@ -1,17 +1,16 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
variables:
- variable:
- name: float
+ - name: float
type: float
description: Description
provider: float
value:
- text: 0.527
- - variable:
- name: float_multi
+ - name: float_multi
type: float
description: Description
multi: true
diff --git a/tests/dictionaries/01base_provider_extra/yml/00-base.yml b/tests/dictionaries/01base_provider_extra/yml/00-base.yml
index c51854962..0a955960c 100644
--- a/tests/dictionaries/01base_provider_extra/yml/00-base.yml
+++ b/tests/dictionaries/01base_provider_extra/yml/00-base.yml
@@ -1,6 +1,6 @@
version: '0.10'
variables:
- variable:
- name: float
+ - name: float
type: float
description: Description
diff --git a/tests/dictionaries/01base_provider_extra/yml/extra_dirs/extra/00-base.yml b/tests/dictionaries/01base_provider_extra/yml/extra_dirs/extra/00-base.yml
index 76e0c972e..8d02582ed 100644
--- a/tests/dictionaries/01base_provider_extra/yml/extra_dirs/extra/00-base.yml
+++ b/tests/dictionaries/01base_provider_extra/yml/extra_dirs/extra/00-base.yml
@@ -1,9 +1,9 @@
version: '0.10'
variables:
- family:
- name: example
+ - name: example
variables:
- variable:
- name: description
+ - name: description
type: string
provider: example
diff --git a/tests/dictionaries/01base_provider_hidden/yml/00-base.yml b/tests/dictionaries/01base_provider_hidden/yml/00-base.yml
index b1849321d..623c9143f 100644
--- a/tests/dictionaries/01base_provider_hidden/yml/00-base.yml
+++ b/tests/dictionaries/01base_provider_hidden/yml/00-base.yml
@@ -1,18 +1,17 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
variables:
- variable:
- name: float
+ - name: float
type: float
description: Description
provider: float
hidden: true
value:
- text: 0.527
- - variable:
- name: float_multi
+ - name: float_multi
type: float
description: Description
multi: true
diff --git a/tests/dictionaries/01base_value_doublequote/yml/00-base.yml b/tests/dictionaries/01base_value_doublequote/yml/00-base.yml
index 8a80f8f22..4addfc03c 100644
--- a/tests/dictionaries/01base_value_doublequote/yml/00-base.yml
+++ b/tests/dictionaries/01base_value_doublequote/yml/00-base.yml
@@ -1,10 +1,10 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
variables:
- variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
type: string
description: Redefine description
hidden: true
diff --git a/tests/dictionaries/01base_value_doublequote2/yml/00-base.yml b/tests/dictionaries/01base_value_doublequote2/yml/00-base.yml
index 49f9108e3..f09fc64b8 100644
--- a/tests/dictionaries/01base_value_doublequote2/yml/00-base.yml
+++ b/tests/dictionaries/01base_value_doublequote2/yml/00-base.yml
@@ -1,10 +1,10 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
variables:
- variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
type: string
description: Redefine description
hidden: true
diff --git a/tests/dictionaries/01base_value_doublequote3/yml/00-base.yml b/tests/dictionaries/01base_value_doublequote3/yml/00-base.yml
index d87501b2e..4940603b0 100644
--- a/tests/dictionaries/01base_value_doublequote3/yml/00-base.yml
+++ b/tests/dictionaries/01base_value_doublequote3/yml/00-base.yml
@@ -1,10 +1,10 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
variables:
- variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
type: string
description: Redefine description
hidden: true
diff --git a/tests/dictionaries/01base_value_multi_doublequote/yml/00-base.yml b/tests/dictionaries/01base_value_multi_doublequote/yml/00-base.yml
index 4b1d3c495..3adea7a9a 100644
--- a/tests/dictionaries/01base_value_multi_doublequote/yml/00-base.yml
+++ b/tests/dictionaries/01base_value_multi_doublequote/yml/00-base.yml
@@ -1,10 +1,10 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
variables:
- variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
type: string
description: Redefine description
hidden: true
diff --git a/tests/dictionaries/01base_value_multi_doublequote2/yml/00-base.yml b/tests/dictionaries/01base_value_multi_doublequote2/yml/00-base.yml
index addbd9887..cd4790091 100644
--- a/tests/dictionaries/01base_value_multi_doublequote2/yml/00-base.yml
+++ b/tests/dictionaries/01base_value_multi_doublequote2/yml/00-base.yml
@@ -1,10 +1,10 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
variables:
- variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
type: string
description: Redefine description
hidden: true
diff --git a/tests/dictionaries/01base_value_multi_quote/yml/00-base.yml b/tests/dictionaries/01base_value_multi_quote/yml/00-base.yml
index 0f0ff3c34..51be55312 100644
--- a/tests/dictionaries/01base_value_multi_quote/yml/00-base.yml
+++ b/tests/dictionaries/01base_value_multi_quote/yml/00-base.yml
@@ -1,10 +1,10 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
variables:
- variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
type: string
description: Redefine description
hidden: true
diff --git a/tests/dictionaries/01base_value_quote/yml/00-base.yml b/tests/dictionaries/01base_value_quote/yml/00-base.yml
index d082e098a..6819d2627 100644
--- a/tests/dictionaries/01base_value_quote/yml/00-base.yml
+++ b/tests/dictionaries/01base_value_quote/yml/00-base.yml
@@ -1,10 +1,10 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
variables:
- variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
type: string
description: Redefine description
hidden: true
diff --git a/tests/dictionaries/01base_var_name_same_family/yml/00-base.yml b/tests/dictionaries/01base_var_name_same_family/yml/00-base.yml
index 4c034b5ea..9e1545873 100644
--- a/tests/dictionaries/01base_var_name_same_family/yml/00-base.yml
+++ b/tests/dictionaries/01base_var_name_same_family/yml/00-base.yml
@@ -1,10 +1,10 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
variables:
- variable:
- name: general
+ - name: general
type: string
description: description
value:
diff --git a/tests/dictionaries/01boolean_no_mandatory/yml/00-base.yml b/tests/dictionaries/01boolean_no_mandatory/yml/00-base.yml
index 76258bc16..9c5e14c23 100644
--- a/tests/dictionaries/01boolean_no_mandatory/yml/00-base.yml
+++ b/tests/dictionaries/01boolean_no_mandatory/yml/00-base.yml
@@ -1,6 +1,6 @@
version: '0.10'
variables:
- variable:
- name: my_variable
+ - name: my_variable
type: boolean
mandatory: false
diff --git a/tests/dictionaries/01family_description/yml/00-base.yml b/tests/dictionaries/01family_description/yml/00-base.yml
index 96ba84c6a..d564de6f8 100644
--- a/tests/dictionaries/01family_description/yml/00-base.yml
+++ b/tests/dictionaries/01family_description/yml/00-base.yml
@@ -1,10 +1,10 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
description: Other description
variables:
- variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
value:
- text: non
diff --git a/tests/dictionaries/01fill_autofreeze/yml/00-base.yml b/tests/dictionaries/01fill_autofreeze/yml/00-base.yml
index 05720115d..9b209da0b 100644
--- a/tests/dictionaries/01fill_autofreeze/yml/00-base.yml
+++ b/tests/dictionaries/01fill_autofreeze/yml/00-base.yml
@@ -1,16 +1,14 @@
version: '0.10'
variables:
- variable:
- name: my_var1
+ - name: my_var1
auto_freeze: true
value:
- text: 'no'
-- variable:
- name: my_var2
+ - name: my_var2
value:
- text: 'no'
-- variable:
- name: server_deployed
+ - name: server_deployed
type: boolean
value:
- text: false
diff --git a/tests/dictionaries/01fill_autosave/yml/00-base.yml b/tests/dictionaries/01fill_autosave/yml/00-base.yml
index 8a3d460b4..0a954a6ff 100644
--- a/tests/dictionaries/01fill_autosave/yml/00-base.yml
+++ b/tests/dictionaries/01fill_autosave/yml/00-base.yml
@@ -1,20 +1,19 @@
version: '0.10'
variables:
- variable:
- name: server_deployed
+ - name: server_deployed
type: boolean
- family:
- name: general
+ - name: general
variables:
- variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
type: string
description: No change
auto_save: true
value:
- text: non
- - variable:
- name: mode_conteneur_actif1
+ - name: mode_conteneur_actif1
type: string
description: No change
value:
diff --git a/tests/dictionaries/01fill_base/yml/00-base.yml b/tests/dictionaries/01fill_base/yml/00-base.yml
index c7ffae0f8..72437bb75 100644
--- a/tests/dictionaries/01fill_base/yml/00-base.yml
+++ b/tests/dictionaries/01fill_base/yml/00-base.yml
@@ -1,14 +1,13 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
variables:
- variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
type: string
description: No change
- - variable:
- name: mode_conteneur_actif1
+ - name: mode_conteneur_actif1
type: string
description: No change
value:
diff --git a/tests/dictionaries/01fill_mandatory/yml/00-base.yml b/tests/dictionaries/01fill_mandatory/yml/00-base.yml
index a8d61a98f..0823b1caf 100644
--- a/tests/dictionaries/01fill_mandatory/yml/00-base.yml
+++ b/tests/dictionaries/01fill_mandatory/yml/00-base.yml
@@ -1,17 +1,16 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
mode: basic
variables:
- variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
type: string
description: No change
mandatory: true
mode: expert
- - variable:
- name: mode_conteneur_actif1
+ - name: mode_conteneur_actif1
type: string
description: No change
value:
diff --git a/tests/dictionaries/01fill_number/yml/00-base.yml b/tests/dictionaries/01fill_number/yml/00-base.yml
index 0510f69f3..97de4ec99 100644
--- a/tests/dictionaries/01fill_number/yml/00-base.yml
+++ b/tests/dictionaries/01fill_number/yml/00-base.yml
@@ -1,15 +1,14 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
variables:
- variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
type: number
description: No change
hidden: true
- - variable:
- name: mode_conteneur_actif1
+ - name: mode_conteneur_actif1
type: string
description: No change
value:
diff --git a/tests/dictionaries/01fill_only_optional/yml/00-base.yml b/tests/dictionaries/01fill_only_optional/yml/00-base.yml
index cbe71720f..918721564 100644
--- a/tests/dictionaries/01fill_only_optional/yml/00-base.yml
+++ b/tests/dictionaries/01fill_only_optional/yml/00-base.yml
@@ -1,17 +1,16 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
variables:
- variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
type: string
description: No change
hidden: true
value:
- text: non
- - variable:
- name: mode_conteneur_actif1
+ - name: mode_conteneur_actif1
type: string
description: No change
value:
diff --git a/tests/dictionaries/01fill_optional/yml/00-base.yml b/tests/dictionaries/01fill_optional/yml/00-base.yml
index 9ea6b4e5e..131c518bb 100644
--- a/tests/dictionaries/01fill_optional/yml/00-base.yml
+++ b/tests/dictionaries/01fill_optional/yml/00-base.yml
@@ -1,17 +1,16 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
variables:
- variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
type: string
description: No change
hidden: true
value:
- text: non
- - variable:
- name: mode_conteneur_actif1
+ - name: mode_conteneur_actif1
type: string
description: No change
value:
diff --git a/tests/dictionaries/01fill_quote/yml/00-base.yml b/tests/dictionaries/01fill_quote/yml/00-base.yml
index 1d1a2c0b9..dd1ced227 100644
--- a/tests/dictionaries/01fill_quote/yml/00-base.yml
+++ b/tests/dictionaries/01fill_quote/yml/00-base.yml
@@ -1,22 +1,19 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
variables:
- variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
type: string
description: No change
- - variable:
- name: mode_conteneur_actif1
+ - name: mode_conteneur_actif1
type: string
description: No change
- - variable:
- name: mode_conteneur_actif2
+ - name: mode_conteneur_actif2
type: string
description: No change
- - variable:
- name: mode_conteneur_actif3
+ - name: mode_conteneur_actif3
type: string
description: No change
constraints:
diff --git a/tests/dictionaries/01fill_target_optional/yml/00-base.yml b/tests/dictionaries/01fill_target_optional/yml/00-base.yml
index 32fd5b364..79ae7fc08 100644
--- a/tests/dictionaries/01fill_target_optional/yml/00-base.yml
+++ b/tests/dictionaries/01fill_target_optional/yml/00-base.yml
@@ -1,10 +1,10 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
variables:
- variable:
- name: mode_conteneur_actif1
+ - name: mode_conteneur_actif1
type: string
description: No change
value:
diff --git a/tests/dictionaries/01hidden_if_in_autofreeze/yml/00-base.yml b/tests/dictionaries/01hidden_if_in_autofreeze/yml/00-base.yml
index bd734f47e..dc9bbbef1 100644
--- a/tests/dictionaries/01hidden_if_in_autofreeze/yml/00-base.yml
+++ b/tests/dictionaries/01hidden_if_in_autofreeze/yml/00-base.yml
@@ -1,12 +1,11 @@
version: '0.10'
variables:
- variable:
- name: server_deployed
+ - name: server_deployed
type: boolean
value:
- text: false
-- variable:
- name: my_var
+ - name: my_var
type: string
auto_freeze: true
value:
diff --git a/tests/dictionaries/01test/yml/00-base.yml b/tests/dictionaries/01test/yml/00-base.yml
index bbf0daf96..78ebff891 100644
--- a/tests/dictionaries/01test/yml/00-base.yml
+++ b/tests/dictionaries/01test/yml/00-base.yml
@@ -1,10 +1,10 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
variables:
- variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
test: test
value:
- text: non
diff --git a/tests/dictionaries/01test_multi/yml/00-base.yml b/tests/dictionaries/01test_multi/yml/00-base.yml
index 9598b08e3..e9fd0c671 100644
--- a/tests/dictionaries/01test_multi/yml/00-base.yml
+++ b/tests/dictionaries/01test_multi/yml/00-base.yml
@@ -1,10 +1,10 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
variables:
- variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
test: test1|test2
value:
- text: non
diff --git a/tests/dictionaries/01test_multi_none/yml/00-base.yml b/tests/dictionaries/01test_multi_none/yml/00-base.yml
index 81f822e3b..a66c8494d 100644
--- a/tests/dictionaries/01test_multi_none/yml/00-base.yml
+++ b/tests/dictionaries/01test_multi_none/yml/00-base.yml
@@ -1,10 +1,10 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
variables:
- variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
test: '|test1|test2'
value:
- text: non
diff --git a/tests/dictionaries/01test_redefine/yml/00-base.yml b/tests/dictionaries/01test_redefine/yml/00-base.yml
index bbf0daf96..78ebff891 100644
--- a/tests/dictionaries/01test_redefine/yml/00-base.yml
+++ b/tests/dictionaries/01test_redefine/yml/00-base.yml
@@ -1,10 +1,10 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
variables:
- variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
test: test
value:
- text: non
diff --git a/tests/dictionaries/01test_redefine/yml/10-base.yml b/tests/dictionaries/01test_redefine/yml/10-base.yml
index 41c954957..e0ce84314 100644
--- a/tests/dictionaries/01test_redefine/yml/10-base.yml
+++ b/tests/dictionaries/01test_redefine/yml/10-base.yml
@@ -1,9 +1,9 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
variables:
- variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
redefine: true
test: test1
diff --git a/tests/dictionaries/01test_redefine_base/yml/00-base.yml b/tests/dictionaries/01test_redefine_base/yml/00-base.yml
index 43530ddf6..f01edd4ed 100644
--- a/tests/dictionaries/01test_redefine_base/yml/00-base.yml
+++ b/tests/dictionaries/01test_redefine_base/yml/00-base.yml
@@ -1,4 +1,4 @@
version: '0.10'
variables:
- variable:
- name: my_variable
+ - name: my_variable
diff --git a/tests/dictionaries/01test_redefine_base/yml/10-base.yml b/tests/dictionaries/01test_redefine_base/yml/10-base.yml
index d95ae267a..77908cc9c 100644
--- a/tests/dictionaries/01test_redefine_base/yml/10-base.yml
+++ b/tests/dictionaries/01test_redefine_base/yml/10-base.yml
@@ -1,6 +1,6 @@
version: '0.10'
variables:
- variable:
- name: my_variable
+ - name: my_variable
redefine: true
test: test1
diff --git a/tests/dictionaries/01test_redefine_remove/yml/00-base.yml b/tests/dictionaries/01test_redefine_remove/yml/00-base.yml
index bbf0daf96..78ebff891 100644
--- a/tests/dictionaries/01test_redefine_remove/yml/00-base.yml
+++ b/tests/dictionaries/01test_redefine_remove/yml/00-base.yml
@@ -1,10 +1,10 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
variables:
- variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
test: test
value:
- text: non
diff --git a/tests/dictionaries/01test_redefine_remove/yml/10-base.yml b/tests/dictionaries/01test_redefine_remove/yml/10-base.yml
index b0a81b29e..56ce4295a 100644
--- a/tests/dictionaries/01test_redefine_remove/yml/10-base.yml
+++ b/tests/dictionaries/01test_redefine_remove/yml/10-base.yml
@@ -1,9 +1,9 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
variables:
- variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
redefine: true
test: ''
diff --git a/tests/dictionaries/02autosave_hidden_frozenifin/yml/00-base.yml b/tests/dictionaries/02autosave_hidden_frozenifin/yml/00-base.yml
index 1c8c879d7..a9fdb56ac 100644
--- a/tests/dictionaries/02autosave_hidden_frozenifin/yml/00-base.yml
+++ b/tests/dictionaries/02autosave_hidden_frozenifin/yml/00-base.yml
@@ -1,21 +1,20 @@
version: '0.10'
variables:
- variable:
- name: server_deployed
+ - name: server_deployed
type: boolean
- family:
- name: general
+ - name: general
description: "g\xE9n\xE9ral"
variables:
- variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
type: string
description: No change
hidden: true
value:
- text: non
- - variable:
- name: autosavevar
+ - name: autosavevar
type: string
description: autosave variable
auto_save: true
diff --git a/tests/dictionaries/02fill_multi_calc_val/yml/00-base.yml b/tests/dictionaries/02fill_multi_calc_val/yml/00-base.yml
index 308947005..65fdbc059 100644
--- a/tests/dictionaries/02fill_multi_calc_val/yml/00-base.yml
+++ b/tests/dictionaries/02fill_multi_calc_val/yml/00-base.yml
@@ -1,11 +1,10 @@
version: '0.10'
variables:
- variable:
- name: var1
+ - name: var1
value:
- text: 'no'
-- variable:
- name: var2
+ - name: var2
multi: true
constraints:
- fill:
diff --git a/tests/dictionaries/02fill_multi_calc_val_multi/yml/00-base.yml b/tests/dictionaries/02fill_multi_calc_val_multi/yml/00-base.yml
index 32c76a6de..011cf1da0 100644
--- a/tests/dictionaries/02fill_multi_calc_val_multi/yml/00-base.yml
+++ b/tests/dictionaries/02fill_multi_calc_val_multi/yml/00-base.yml
@@ -1,14 +1,13 @@
version: '0.10'
variables:
- variable:
- name: var1
+ - name: var1
multi: true
value:
- text: 'no'
- text: 'yes'
- text: maybe
-- variable:
- name: var2
+ - name: var2
multi: true
constraints:
- fill:
diff --git a/tests/dictionaries/10autosave_hidden/yml/00-base.yml b/tests/dictionaries/10autosave_hidden/yml/00-base.yml
index aa2fc26ea..6cb247ebc 100644
--- a/tests/dictionaries/10autosave_hidden/yml/00-base.yml
+++ b/tests/dictionaries/10autosave_hidden/yml/00-base.yml
@@ -1,21 +1,20 @@
version: '0.10'
variables:
- variable:
- name: server_deployed
+ - name: server_deployed
type: boolean
- family:
- name: general
+ - name: general
description: "g\xE9n\xE9ral"
variables:
- variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
type: string
description: No change
hidden: true
value:
- text: non
- - variable:
- name: autosavevar
+ - name: autosavevar
type: string
description: autosave variable
hidden: true
diff --git a/tests/dictionaries/10check_base/yml/00-base.yml b/tests/dictionaries/10check_base/yml/00-base.yml
index 312f29ab3..6a4389c7d 100644
--- a/tests/dictionaries/10check_base/yml/00-base.yml
+++ b/tests/dictionaries/10check_base/yml/00-base.yml
@@ -1,16 +1,15 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
variables:
- variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
type: string
description: No change
value:
- text: b
- - variable:
- name: int
+ - name: int
type: number
description: No change
constraints:
diff --git a/tests/dictionaries/10check_base_target_optional/yml/00-base.yml b/tests/dictionaries/10check_base_target_optional/yml/00-base.yml
index 46e0bf922..d5fbc6b51 100644
--- a/tests/dictionaries/10check_base_target_optional/yml/00-base.yml
+++ b/tests/dictionaries/10check_base_target_optional/yml/00-base.yml
@@ -1,7 +1,7 @@
version: '0.10'
variables:
- variable:
- name: my_variable
+ - name: my_variable
constraints:
- check:
- name: valid_entier
diff --git a/tests/dictionaries/10check_no_param/yml/00-base.yml b/tests/dictionaries/10check_no_param/yml/00-base.yml
index 6e5cbb115..b0433d295 100644
--- a/tests/dictionaries/10check_no_param/yml/00-base.yml
+++ b/tests/dictionaries/10check_no_param/yml/00-base.yml
@@ -1,16 +1,15 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
variables:
- variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
type: string
description: No change
value:
- text: b
- - variable:
- name: int
+ - name: int
type: number
description: No change
constraints:
diff --git a/tests/dictionaries/10check_option/yml/00-base.yml b/tests/dictionaries/10check_option/yml/00-base.yml
index 5ad3d45b9..4c762ce60 100644
--- a/tests/dictionaries/10check_option/yml/00-base.yml
+++ b/tests/dictionaries/10check_option/yml/00-base.yml
@@ -1,22 +1,20 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
variables:
- variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
type: string
description: No change
value:
- text: b
- - variable:
- name: int2
+ - name: int2
type: number
description: No change
value:
- text: 100
- - variable:
- name: int
+ - name: int
type: number
description: No change
constraints:
diff --git a/tests/dictionaries/10check_optional/yml/00-base.yml b/tests/dictionaries/10check_optional/yml/00-base.yml
index 4e92a6cf8..47241ce0f 100644
--- a/tests/dictionaries/10check_optional/yml/00-base.yml
+++ b/tests/dictionaries/10check_optional/yml/00-base.yml
@@ -1,20 +1,18 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
variables:
- variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
type: string
description: No change
value:
- text: b
- - variable:
- name: int
+ - name: int
type: number
description: No change
- - variable:
- name: int2
+ - name: int2
type: number
description: No change
constraints:
diff --git a/tests/dictionaries/10check_valid_differ/yml/00-base.yml b/tests/dictionaries/10check_valid_differ/yml/00-base.yml
index 10e6edb22..52059f34c 100644
--- a/tests/dictionaries/10check_valid_differ/yml/00-base.yml
+++ b/tests/dictionaries/10check_valid_differ/yml/00-base.yml
@@ -1,16 +1,15 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
variables:
- variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
type: string
description: No change
value:
- text: oui
- - variable:
- name: mode_conteneur_actif1
+ - name: mode_conteneur_actif1
type: string
description: No change
value:
diff --git a/tests/dictionaries/10check_valid_differ_add/yml/00-base.yml b/tests/dictionaries/10check_valid_differ_add/yml/00-base.yml
index da1529a19..0194c65b8 100644
--- a/tests/dictionaries/10check_valid_differ_add/yml/00-base.yml
+++ b/tests/dictionaries/10check_valid_differ_add/yml/00-base.yml
@@ -1,28 +1,25 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
variables:
- variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
type: string
description: No change
value:
- text: oui
- - variable:
- name: mode_conteneur_actif1
+ - name: mode_conteneur_actif1
type: string
description: No change
value:
- text: non
- - variable:
- name: mode_conteneur_actif2
+ - name: mode_conteneur_actif2
type: string
description: No change
value:
- text: non
- - variable:
- name: mode_conteneur_actif3
+ - name: mode_conteneur_actif3
type: string
description: No change
value:
diff --git a/tests/dictionaries/10check_valid_differ_add/yml/01-base.yml b/tests/dictionaries/10check_valid_differ_add/yml/01-base.yml
index c64c36ea1..cf277070e 100644
--- a/tests/dictionaries/10check_valid_differ_add/yml/01-base.yml
+++ b/tests/dictionaries/10check_valid_differ_add/yml/01-base.yml
@@ -1,10 +1,10 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
variables:
- variable:
- name: mode_conteneur_actif3
+ - name: mode_conteneur_actif3
redefine: true
constraints:
- check:
diff --git a/tests/dictionaries/10check_valid_differ_removecheck/yml/00-base.yml b/tests/dictionaries/10check_valid_differ_removecheck/yml/00-base.yml
index da1529a19..0194c65b8 100644
--- a/tests/dictionaries/10check_valid_differ_removecheck/yml/00-base.yml
+++ b/tests/dictionaries/10check_valid_differ_removecheck/yml/00-base.yml
@@ -1,28 +1,25 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
variables:
- variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
type: string
description: No change
value:
- text: oui
- - variable:
- name: mode_conteneur_actif1
+ - name: mode_conteneur_actif1
type: string
description: No change
value:
- text: non
- - variable:
- name: mode_conteneur_actif2
+ - name: mode_conteneur_actif2
type: string
description: No change
value:
- text: non
- - variable:
- name: mode_conteneur_actif3
+ - name: mode_conteneur_actif3
type: string
description: No change
value:
diff --git a/tests/dictionaries/10check_valid_differ_removecheck/yml/01-base.yml b/tests/dictionaries/10check_valid_differ_removecheck/yml/01-base.yml
index b85364468..4262e11e1 100644
--- a/tests/dictionaries/10check_valid_differ_removecheck/yml/01-base.yml
+++ b/tests/dictionaries/10check_valid_differ_removecheck/yml/01-base.yml
@@ -1,10 +1,10 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
variables:
- variable:
- name: mode_conteneur_actif3
+ - name: mode_conteneur_actif3
redefine: true
remove_check: true
value:
diff --git a/tests/dictionaries/10check_valid_in_network/yml/00-base.yml b/tests/dictionaries/10check_valid_in_network/yml/00-base.yml
index 17e805701..c39d097e3 100644
--- a/tests/dictionaries/10check_valid_in_network/yml/00-base.yml
+++ b/tests/dictionaries/10check_valid_in_network/yml/00-base.yml
@@ -1,28 +1,25 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
variables:
- variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
type: string
description: No change
value:
- text: oui
- - variable:
- name: adresse_ip_eth0
+ - name: adresse_ip_eth0
type: local_ip
description: Adresse IP de la carte
mandatory: true
mode: basic
- - variable:
- name: adresse_netmask_eth0
+ - name: adresse_netmask_eth0
type: netmask
description: "Masque de sous r\xE9seau de la carte"
mandatory: true
mode: basic
- - variable:
- name: adresse_ip
+ - name: adresse_ip
type: local_ip
description: IP
mandatory: true
diff --git a/tests/dictionaries/10check_valid_in_network_cidr/yml/00-base.yml b/tests/dictionaries/10check_valid_in_network_cidr/yml/00-base.yml
index a7d23d799..d8069d904 100644
--- a/tests/dictionaries/10check_valid_in_network_cidr/yml/00-base.yml
+++ b/tests/dictionaries/10check_valid_in_network_cidr/yml/00-base.yml
@@ -1,22 +1,20 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
variables:
- variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
type: string
description: No change
value:
- text: oui
- - variable:
- name: adresse_ip_eth0
+ - name: adresse_ip_eth0
type: cidr
description: Adresse IP de la carte
mandatory: true
mode: basic
- - variable:
- name: adresse_ip
+ - name: adresse_ip
type: local_ip
description: IP
mandatory: true
diff --git a/tests/dictionaries/10check_valid_ipnetmask/yml/00-base.yml b/tests/dictionaries/10check_valid_ipnetmask/yml/00-base.yml
index ca15ebd33..a08311164 100644
--- a/tests/dictionaries/10check_valid_ipnetmask/yml/00-base.yml
+++ b/tests/dictionaries/10check_valid_ipnetmask/yml/00-base.yml
@@ -1,22 +1,20 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
variables:
- variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
type: string
description: No change
value:
- text: oui
- - variable:
- name: adresse_ip_eth0
+ - name: adresse_ip_eth0
type: local_ip
description: Adresse IP de la carte
mandatory: true
mode: basic
- - variable:
- name: adresse_netmask_eth0
+ - name: adresse_netmask_eth0
type: netmask
description: "Masque de sous r\xE9seau de la carte"
mandatory: true
diff --git a/tests/dictionaries/10fill_information/yml/00-base.yml b/tests/dictionaries/10fill_information/yml/00-base.yml
index 45584b8aa..e48d9d7cb 100644
--- a/tests/dictionaries/10fill_information/yml/00-base.yml
+++ b/tests/dictionaries/10fill_information/yml/00-base.yml
@@ -1,10 +1,10 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
variables:
- variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
type: string
description: No change
constraints:
diff --git a/tests/dictionaries/10fill_information_multi/yml/00-base.yml b/tests/dictionaries/10fill_information_multi/yml/00-base.yml
index d70882725..1f3b546fa 100644
--- a/tests/dictionaries/10fill_information_multi/yml/00-base.yml
+++ b/tests/dictionaries/10fill_information_multi/yml/00-base.yml
@@ -1,10 +1,10 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
variables:
- variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
type: string
description: No change
multi: true
diff --git a/tests/dictionaries/10frozenifin_unknown_valid_enum_number/yml/00-base.yml b/tests/dictionaries/10frozenifin_unknown_valid_enum_number/yml/00-base.yml
index 17f624bfb..481c19672 100644
--- a/tests/dictionaries/10frozenifin_unknown_valid_enum_number/yml/00-base.yml
+++ b/tests/dictionaries/10frozenifin_unknown_valid_enum_number/yml/00-base.yml
@@ -1,21 +1,20 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
mode: expert
variables:
- variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
type: string
description: No change
value:
- text: non
-- family:
- name: enumfam
+ - name: enumfam
mode: expert
variables:
- variable:
- name: enumvar
+ - name: enumvar
type: choice
description: enumvar
help: bla bla bla
@@ -29,8 +28,7 @@ variables:
value:
- type: number
text: 1
- - variable:
- name: test_variable
+ - name: test_variable
type: number
description: test variable
constraints:
diff --git a/tests/dictionaries/10leadership_append/yml/00-base.yml b/tests/dictionaries/10leadership_append/yml/00-base.yml
index e72f25af8..1b78228fa 100644
--- a/tests/dictionaries/10leadership_append/yml/00-base.yml
+++ b/tests/dictionaries/10leadership_append/yml/00-base.yml
@@ -1,33 +1,30 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
variables:
- variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
type: string
description: No change
value:
- text: non
-- family:
- name: general1
+ - name: general1
variables:
- family:
- name: leader
+ - name: leader
description: leader
leadership: true
variables:
- variable:
- name: leader
+ - name: leader
type: string
description: leader
multi: true
- - variable:
- name: follower1
+ - name: follower1
type: string
description: follower1
- - variable:
- name: follower2
+ - name: follower2
type: string
description: follower2
constraints:
diff --git a/tests/dictionaries/10leadership_append/yml/01-base.yml b/tests/dictionaries/10leadership_append/yml/01-base.yml
index b3775a627..8a11b8efa 100644
--- a/tests/dictionaries/10leadership_append/yml/01-base.yml
+++ b/tests/dictionaries/10leadership_append/yml/01-base.yml
@@ -1,13 +1,13 @@
version: '0.10'
variables:
- family:
- name: general1
+ - name: general1
variables:
- family:
- name: leader
+ - name: leader
leadership: true
variables:
- variable:
- name: follower3
+ - name: follower3
type: string
description: follower3
diff --git a/tests/dictionaries/10leadership_append_hidden/yml/00-base.yml b/tests/dictionaries/10leadership_append_hidden/yml/00-base.yml
index c1403f29d..5cac8e677 100644
--- a/tests/dictionaries/10leadership_append_hidden/yml/00-base.yml
+++ b/tests/dictionaries/10leadership_append_hidden/yml/00-base.yml
@@ -1,34 +1,31 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
variables:
- variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
type: string
description: No change
value:
- text: non
-- family:
- name: general1
+ - name: general1
variables:
- family:
- name: leader
+ - name: leader
description: leader
leadership: true
variables:
- variable:
- name: leader
+ - name: leader
type: string
description: leader
multi: true
hidden: true
- - variable:
- name: follower1
+ - name: follower1
type: string
description: follower1
- - variable:
- name: follower2
+ - name: follower2
type: string
description: follower2
constraints:
diff --git a/tests/dictionaries/10leadership_append_hidden/yml/01-base.yml b/tests/dictionaries/10leadership_append_hidden/yml/01-base.yml
index b3775a627..8a11b8efa 100644
--- a/tests/dictionaries/10leadership_append_hidden/yml/01-base.yml
+++ b/tests/dictionaries/10leadership_append_hidden/yml/01-base.yml
@@ -1,13 +1,13 @@
version: '0.10'
variables:
- family:
- name: general1
+ - name: general1
variables:
- family:
- name: leader
+ - name: leader
leadership: true
variables:
- variable:
- name: follower3
+ - name: follower3
type: string
description: follower3
diff --git a/tests/dictionaries/10leadership_append_name/yml/00-base.yml b/tests/dictionaries/10leadership_append_name/yml/00-base.yml
index 8c1efa4d7..ca15d0106 100644
--- a/tests/dictionaries/10leadership_append_name/yml/00-base.yml
+++ b/tests/dictionaries/10leadership_append_name/yml/00-base.yml
@@ -1,33 +1,30 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
variables:
- variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
type: string
description: No change
value:
- text: non
-- family:
- name: general1
+ - name: general1
variables:
- family:
- name: leadership
+ - name: leadership
description: leadership
leadership: true
variables:
- variable:
- name: leader
+ - name: leader
type: string
description: leader
multi: true
- - variable:
- name: follower1
+ - name: follower1
type: string
description: follower1
- - variable:
- name: follower2
+ - name: follower2
type: string
description: follower2
constraints:
diff --git a/tests/dictionaries/10leadership_append_name/yml/01-base.yml b/tests/dictionaries/10leadership_append_name/yml/01-base.yml
index 2bbb0e47a..7c355783f 100644
--- a/tests/dictionaries/10leadership_append_name/yml/01-base.yml
+++ b/tests/dictionaries/10leadership_append_name/yml/01-base.yml
@@ -1,13 +1,13 @@
version: '0.10'
variables:
- family:
- name: general1
+ - name: general1
variables:
- family:
- name: leadership
+ - name: leadership
leadership: true
variables:
- variable:
- name: follower3
+ - name: follower3
type: string
description: follower3
diff --git a/tests/dictionaries/10leadership_auto/yml/00-base.yml b/tests/dictionaries/10leadership_auto/yml/00-base.yml
index ef048f429..ab6640d2c 100644
--- a/tests/dictionaries/10leadership_auto/yml/00-base.yml
+++ b/tests/dictionaries/10leadership_auto/yml/00-base.yml
@@ -1,36 +1,33 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
variables:
- variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
type: string
description: No change
value:
- text: non
- family:
- name: leader
+ - name: leader
description: leader
leadership: true
variables:
- variable:
- name: leader
+ - name: leader
type: string
description: leader
multi: true
- - variable:
- name: follower1
+ - name: follower1
type: string
description: follower1
hidden: true
- - variable:
- name: follower2
+ - name: follower2
type: string
description: follower2
hidden: true
- - variable:
- name: follower3
+ - name: follower3
type: string
description: follower3
hidden: true
diff --git a/tests/dictionaries/10leadership_auto_index/yml/00-base.yml b/tests/dictionaries/10leadership_auto_index/yml/00-base.yml
index b18b9dc6f..9eb995fea 100644
--- a/tests/dictionaries/10leadership_auto_index/yml/00-base.yml
+++ b/tests/dictionaries/10leadership_auto_index/yml/00-base.yml
@@ -1,19 +1,18 @@
version: '0.10'
variables:
- family:
- name: leader
+ - name: leader
description: leader
leadership: true
variables:
- variable:
- name: leader
+ - name: leader
multi: true
value:
- text: a
- text: b
- text: c
- - variable:
- name: follower1
+ - name: follower1
type: number
constraints:
- fill:
diff --git a/tests/dictionaries/10leadership_autoleader/yml/00-base.yml b/tests/dictionaries/10leadership_autoleader/yml/00-base.yml
index 8866c12db..e31d3e17a 100644
--- a/tests/dictionaries/10leadership_autoleader/yml/00-base.yml
+++ b/tests/dictionaries/10leadership_autoleader/yml/00-base.yml
@@ -1,31 +1,29 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
variables:
- variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
type: string
description: No change
value:
- text: non
- family:
- name: leader
+ - name: leader
description: leader
leadership: true
variables:
- variable:
- name: leader
+ - name: leader
type: string
description: leader
multi: true
- - variable:
- name: follower1
+ - name: follower1
type: string
description: follower1
hidden: true
- - variable:
- name: follower2
+ - name: follower2
type: string
description: follower2
hidden: true
diff --git a/tests/dictionaries/10leadership_autoleader_expert/yml/00-base.yml b/tests/dictionaries/10leadership_autoleader_expert/yml/00-base.yml
index 69a9e8776..fc8e48222 100644
--- a/tests/dictionaries/10leadership_autoleader_expert/yml/00-base.yml
+++ b/tests/dictionaries/10leadership_autoleader_expert/yml/00-base.yml
@@ -1,35 +1,32 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
mode: expert
variables:
- variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
type: string
description: No change
value:
- text: non
-- family:
- name: leadermode
+ - name: leadermode
variables:
- family:
- name: leader
+ - name: leader
description: leader
leadership: true
variables:
- variable:
- name: leader
+ - name: leader
type: string
description: leader
multi: true
mode: expert
- - variable:
- name: follower1
+ - name: follower1
type: string
description: follower1
- - variable:
- name: follower2
+ - name: follower2
type: string
description: follower2
constraints:
diff --git a/tests/dictionaries/10leadership_autosaveexpert/yml/00-base.yml b/tests/dictionaries/10leadership_autosaveexpert/yml/00-base.yml
index d7cccdd2a..4e95d1d53 100644
--- a/tests/dictionaries/10leadership_autosaveexpert/yml/00-base.yml
+++ b/tests/dictionaries/10leadership_autosaveexpert/yml/00-base.yml
@@ -1,30 +1,28 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
variables:
- variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
type: string
description: No change
value:
- text: non
- family:
- name: leader
+ - name: leader
description: leader
leadership: true
variables:
- variable:
- name: leader
+ - name: leader
type: string
description: leader
multi: true
- - variable:
- name: follower1
+ - name: follower1
type: string
description: follower1
- - variable:
- name: follower2
+ - name: follower2
type: string
description: follower2
mode: expert
diff --git a/tests/dictionaries/10leadership_empty/yml/00_base.yml b/tests/dictionaries/10leadership_empty/yml/00_base.yml
index b03574687..da48fa3f3 100644
--- a/tests/dictionaries/10leadership_empty/yml/00_base.yml
+++ b/tests/dictionaries/10leadership_empty/yml/00_base.yml
@@ -4,5 +4,5 @@ services:
- name: tata
variables:
- family:
- name: empty_leader
+ - name: empty_leader
leadership: true
diff --git a/tests/dictionaries/10leadership_leader_hidden/yml/00-base.yml b/tests/dictionaries/10leadership_leader_hidden/yml/00-base.yml
index f61aacead..d446ad800 100644
--- a/tests/dictionaries/10leadership_leader_hidden/yml/00-base.yml
+++ b/tests/dictionaries/10leadership_leader_hidden/yml/00-base.yml
@@ -1,35 +1,32 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
mode: expert
variables:
- variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
type: string
description: No change
value:
- text: non
-- family:
- name: leadermode
+ - name: leadermode
variables:
- family:
- name: leader
+ - name: leader
description: leader
leadership: true
variables:
- variable:
- name: leader
+ - name: leader
type: string
description: leader
multi: true
hidden: true
- - variable:
- name: follower1
+ - name: follower1
type: string
description: follower1
- - variable:
- name: follower2
+ - name: follower2
type: string
description: follower2
constraints:
diff --git a/tests/dictionaries/10leadership_leader_hidden_if_in/yml/00-base.yml b/tests/dictionaries/10leadership_leader_hidden_if_in/yml/00-base.yml
index 8687d3000..1a7e8563a 100644
--- a/tests/dictionaries/10leadership_leader_hidden_if_in/yml/00-base.yml
+++ b/tests/dictionaries/10leadership_leader_hidden_if_in/yml/00-base.yml
@@ -1,34 +1,31 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
mode: expert
variables:
- variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
type: string
description: No change
value:
- text: non
-- family:
- name: leadermode
+ - name: leadermode
variables:
- family:
- name: leader
+ - name: leader
description: leader
leadership: true
variables:
- variable:
- name: leader
+ - name: leader
type: string
description: leader
multi: true
- - variable:
- name: follower1
+ - name: follower1
type: string
description: follower1
- - variable:
- name: follower2
+ - name: follower2
type: string
description: follower2
constraints:
diff --git a/tests/dictionaries/10leadership_leader_hidden_if_in_name/yml/00-base.yml b/tests/dictionaries/10leadership_leader_hidden_if_in_name/yml/00-base.yml
index 7fd3a5960..6977fc04f 100644
--- a/tests/dictionaries/10leadership_leader_hidden_if_in_name/yml/00-base.yml
+++ b/tests/dictionaries/10leadership_leader_hidden_if_in_name/yml/00-base.yml
@@ -1,34 +1,31 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
mode: expert
variables:
- variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
type: string
description: No change
value:
- text: non
-- family:
- name: leadermode
+ - name: leadermode
variables:
- family:
- name: other
+ - name: other
description: other
leadership: true
variables:
- variable:
- name: leader
+ - name: leader
type: string
description: leader
multi: true
- - variable:
- name: follower1
+ - name: follower1
type: string
description: follower1
- - variable:
- name: follower2
+ - name: follower2
type: string
description: follower2
constraints:
diff --git a/tests/dictionaries/10leadership_leadermandatory/yml/00-base.yml b/tests/dictionaries/10leadership_leadermandatory/yml/00-base.yml
index f6f5214d6..bdcecafbe 100644
--- a/tests/dictionaries/10leadership_leadermandatory/yml/00-base.yml
+++ b/tests/dictionaries/10leadership_leadermandatory/yml/00-base.yml
@@ -1,31 +1,29 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
variables:
- variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
type: string
description: No change
value:
- text: non
- family:
- name: leader
+ - name: leader
description: leader
leadership: true
variables:
- variable:
- name: leader
+ - name: leader
type: string
description: leader
multi: true
mandatory: true
- - variable:
- name: follower1
+ - name: follower1
type: string
description: follower1
- - variable:
- name: follower2
+ - name: follower2
type: string
description: follower2
constraints:
diff --git a/tests/dictionaries/10leadership_mandatory/yml/00-base.yml b/tests/dictionaries/10leadership_mandatory/yml/00-base.yml
index cff6fc3dc..f6052c0aa 100644
--- a/tests/dictionaries/10leadership_mandatory/yml/00-base.yml
+++ b/tests/dictionaries/10leadership_mandatory/yml/00-base.yml
@@ -1,31 +1,29 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
variables:
- variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
type: string
description: No change
value:
- text: non
- family:
- name: leader
+ - name: leader
description: leader
leadership: true
variables:
- variable:
- name: leader
+ - name: leader
type: string
description: leader
multi: true
- - variable:
- name: follower1
+ - name: follower1
type: string
description: follower1
mandatory: true
- - variable:
- name: follower2
+ - name: follower2
type: string
description: follower2
constraints:
diff --git a/tests/dictionaries/10leadership_mandatoryfollower/yml/00-base.yml b/tests/dictionaries/10leadership_mandatoryfollower/yml/00-base.yml
index 7b6bb29b6..a235c481b 100644
--- a/tests/dictionaries/10leadership_mandatoryfollower/yml/00-base.yml
+++ b/tests/dictionaries/10leadership_mandatoryfollower/yml/00-base.yml
@@ -1,28 +1,27 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
description: "g\xE9n\xE9ral"
variables:
- variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
type: string
description: No change
hidden: true
value:
- text: oui
- family:
- name: nut_monitor_netmask
+ - name: nut_monitor_netmask
description: "Masque de l'IP du r\xE9seau de l'esclave"
leadership: true
variables:
- variable:
- name: nut_monitor_netmask
+ - name: nut_monitor_netmask
type: netmask
description: "Masque de l'IP du r\xE9seau de l'esclave"
multi: true
- - variable:
- name: nut_monitor_host
+ - name: nut_monitor_host
type: network
description: "Adresse IP du r\xE9seau de l'esclave"
mandatory: true
diff --git a/tests/dictionaries/10leadership_mandatoryfollower_value/yml/00-base.yml b/tests/dictionaries/10leadership_mandatoryfollower_value/yml/00-base.yml
index a60ed3460..32cd3343c 100644
--- a/tests/dictionaries/10leadership_mandatoryfollower_value/yml/00-base.yml
+++ b/tests/dictionaries/10leadership_mandatoryfollower_value/yml/00-base.yml
@@ -1,28 +1,27 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
description: "g\xE9n\xE9ral"
variables:
- variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
type: string
description: No change
hidden: true
value:
- text: oui
- family:
- name: nut_monitor_netmask
+ - name: nut_monitor_netmask
description: "Masque de l'IP du r\xE9seau de l'esclave"
leadership: true
variables:
- variable:
- name: nut_monitor_netmask
+ - name: nut_monitor_netmask
type: netmask
description: "Masque de l'IP du r\xE9seau de l'esclave"
multi: true
- - variable:
- name: nut_monitor_host
+ - name: nut_monitor_host
type: network
description: "Adresse IP du r\xE9seau de l'esclave"
mandatory: true
diff --git a/tests/dictionaries/10leadership_multi/yml/00-base.yml b/tests/dictionaries/10leadership_multi/yml/00-base.yml
index b7ca9c163..218e5ba74 100644
--- a/tests/dictionaries/10leadership_multi/yml/00-base.yml
+++ b/tests/dictionaries/10leadership_multi/yml/00-base.yml
@@ -1,51 +1,45 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
variables:
- variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
type: string
description: No change
value:
- text: non
-- family:
- name: general1
+ - name: general1
variables:
- family:
- name: leader
+ - name: leader
description: leader
leadership: true
variables:
- variable:
- name: leader
+ - name: leader
type: string
description: leader
multi: true
- - variable:
- name: follower1
+ - name: follower1
type: string
description: follower1
- - variable:
- name: follower2
+ - name: follower2
type: string
description: follower2
- - family:
- name: leader1
+ - name: leader1
description: leader
leadership: true
variables:
- variable:
- name: leader1
+ - name: leader1
type: string
description: leader
multi: true
- - variable:
- name: follower11
+ - name: follower11
type: string
description: follower1
- - variable:
- name: follower21
+ - name: follower21
type: string
description: follower2
constraints:
diff --git a/tests/dictionaries/10load_disabled_if_in/yml/00-base.yml b/tests/dictionaries/10load_disabled_if_in/yml/00-base.yml
index 8bb9613bc..2f0a21761 100644
--- a/tests/dictionaries/10load_disabled_if_in/yml/00-base.yml
+++ b/tests/dictionaries/10load_disabled_if_in/yml/00-base.yml
@@ -1,23 +1,21 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
variables:
- variable:
- name: condition
+ - name: condition
type: string
description: No change
value:
- text: non
- - variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
type: string
description: No change
hidden: true
value:
- text: non
- - variable:
- name: mode_conteneur_actif2
+ - name: mode_conteneur_actif2
type: string
description: No change
hidden: true
diff --git a/tests/dictionaries/10load_disabled_if_in_fill/yml/00-base.yml b/tests/dictionaries/10load_disabled_if_in_fill/yml/00-base.yml
index e8ab12c93..b9d6167a2 100644
--- a/tests/dictionaries/10load_disabled_if_in_fill/yml/00-base.yml
+++ b/tests/dictionaries/10load_disabled_if_in_fill/yml/00-base.yml
@@ -1,18 +1,16 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
variables:
- variable:
- name: condition
+ - name: condition
type: string
value:
- text: 'no'
- - variable:
- name: variable1
+ - name: variable1
type: string
- - variable:
- name: variable2
+ - name: variable2
type: string
constraints:
- condition:
diff --git a/tests/dictionaries/10load_disabled_if_in_list_optional/yml/00-base.yml b/tests/dictionaries/10load_disabled_if_in_list_optional/yml/00-base.yml
index e7cd90d7a..43ac8fcc4 100644
--- a/tests/dictionaries/10load_disabled_if_in_list_optional/yml/00-base.yml
+++ b/tests/dictionaries/10load_disabled_if_in_list_optional/yml/00-base.yml
@@ -1,7 +1,7 @@
version: '0.10'
variables:
- variable:
- name: condition
+ - name: condition
type: boolean
constraints:
- condition:
diff --git a/tests/dictionaries/10load_disabled_if_in_multi_param/yml/00-base.yml b/tests/dictionaries/10load_disabled_if_in_multi_param/yml/00-base.yml
index 5644a0c27..2e52b6994 100644
--- a/tests/dictionaries/10load_disabled_if_in_multi_param/yml/00-base.yml
+++ b/tests/dictionaries/10load_disabled_if_in_multi_param/yml/00-base.yml
@@ -7,23 +7,21 @@ services:
text: /tmp/file1
variables:
- family:
- name: general
+ - name: general
variables:
- variable:
- name: condition
+ - name: condition
type: string
description: No change
value:
- text: non
- - variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
type: string
description: No change
hidden: true
value:
- text: non
- - variable:
- name: mode_conteneur_actif2
+ - name: mode_conteneur_actif2
type: string
description: No change
hidden: true
diff --git a/tests/dictionaries/10load_disabled_if_in_multi_param2/yml/00-base.yml b/tests/dictionaries/10load_disabled_if_in_multi_param2/yml/00-base.yml
index b505679ea..bbef7e2bd 100644
--- a/tests/dictionaries/10load_disabled_if_in_multi_param2/yml/00-base.yml
+++ b/tests/dictionaries/10load_disabled_if_in_multi_param2/yml/00-base.yml
@@ -7,22 +7,20 @@ services:
text: /tmp/file1
variables:
- family:
- name: general
+ - name: general
variables:
- variable:
- name: condition
+ - name: condition
type: string
description: No change
value:
- text: 'no'
- - variable:
- name: condition2
+ - name: condition2
type: string
description: No change
value:
- text: 'no'
- - variable:
- name: test_variable
+ - name: test_variable
type: string
description: No change
hidden: true
diff --git a/tests/dictionaries/10load_disabled_if_in_multi_param3/yml/00-base.yml b/tests/dictionaries/10load_disabled_if_in_multi_param3/yml/00-base.yml
index 83f3e53cd..fe6db7077 100644
--- a/tests/dictionaries/10load_disabled_if_in_multi_param3/yml/00-base.yml
+++ b/tests/dictionaries/10load_disabled_if_in_multi_param3/yml/00-base.yml
@@ -7,22 +7,20 @@ services:
text: /tmp/file1
variables:
- family:
- name: general
+ - name: general
variables:
- variable:
- name: condition
+ - name: condition
type: string
description: No change
value:
- text: 'no'
- - variable:
- name: condition2
+ - name: condition2
type: string
description: No change
value:
- text: 'no'
- - variable:
- name: test_variable
+ - name: test_variable
type: string
description: No change
hidden: true
diff --git a/tests/dictionaries/10load_disabled_if_in_multi_param4/yml/00-base.yml b/tests/dictionaries/10load_disabled_if_in_multi_param4/yml/00-base.yml
index 738462e75..bc69cb994 100644
--- a/tests/dictionaries/10load_disabled_if_in_multi_param4/yml/00-base.yml
+++ b/tests/dictionaries/10load_disabled_if_in_multi_param4/yml/00-base.yml
@@ -7,22 +7,20 @@ services:
text: /tmp/file1
variables:
- family:
- name: general
+ - name: general
variables:
- variable:
- name: condition
+ - name: condition
type: string
description: No change
value:
- text: 'yes'
- - variable:
- name: condition2
+ - name: condition2
type: string
description: No change
value:
- text: 'no'
- - variable:
- name: test_variable
+ - name: test_variable
type: string
description: No change
hidden: true
diff --git a/tests/dictionaries/10load_disabled_if_in_multi_param5/yml/00-base.yml b/tests/dictionaries/10load_disabled_if_in_multi_param5/yml/00-base.yml
index ae29277ec..b27ed01ee 100644
--- a/tests/dictionaries/10load_disabled_if_in_multi_param5/yml/00-base.yml
+++ b/tests/dictionaries/10load_disabled_if_in_multi_param5/yml/00-base.yml
@@ -7,22 +7,20 @@ services:
text: /tmp/file1
variables:
- family:
- name: general
+ - name: general
variables:
- variable:
- name: condition
+ - name: condition
type: string
description: No change
value:
- text: 'yes'
- - variable:
- name: condition2
+ - name: condition2
type: string
description: No change
value:
- text: 'yes'
- - variable:
- name: test_variable
+ - name: test_variable
type: string
description: No change
hidden: true
diff --git a/tests/dictionaries/10load_disabled_if_in_multi_param6/yml/00-base.yml b/tests/dictionaries/10load_disabled_if_in_multi_param6/yml/00-base.yml
index 1739cb57d..2e7bd8fb4 100644
--- a/tests/dictionaries/10load_disabled_if_in_multi_param6/yml/00-base.yml
+++ b/tests/dictionaries/10load_disabled_if_in_multi_param6/yml/00-base.yml
@@ -7,22 +7,20 @@ services:
text: /tmp/file1
variables:
- family:
- name: general
+ - name: general
variables:
- variable:
- name: condition
+ - name: condition
type: string
description: No change
value:
- text: 'no'
- - variable:
- name: condition2
+ - name: condition2
type: string
description: No change
value:
- text: 'yes'
- - variable:
- name: test_variable
+ - name: test_variable
type: string
description: No change
hidden: true
diff --git a/tests/dictionaries/10load_disabled_if_in_multi_param_disabled/yml/00-base.yml b/tests/dictionaries/10load_disabled_if_in_multi_param_disabled/yml/00-base.yml
index 8a620fbbd..506ee60d6 100644
--- a/tests/dictionaries/10load_disabled_if_in_multi_param_disabled/yml/00-base.yml
+++ b/tests/dictionaries/10load_disabled_if_in_multi_param_disabled/yml/00-base.yml
@@ -7,23 +7,21 @@ services:
text: /tmp/file1
variables:
- family:
- name: general
+ - name: general
variables:
- variable:
- name: condition
+ - name: condition
type: string
description: No change
value:
- text: oui
- - variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
type: string
description: No change
hidden: true
value:
- text: non
- - variable:
- name: mode_conteneur_actif2
+ - name: mode_conteneur_actif2
type: string
description: No change
hidden: true
diff --git a/tests/dictionaries/10load_disabled_if_in_none/yml/00-base.yml b/tests/dictionaries/10load_disabled_if_in_none/yml/00-base.yml
index b45f9c8e1..5d3e8d173 100644
--- a/tests/dictionaries/10load_disabled_if_in_none/yml/00-base.yml
+++ b/tests/dictionaries/10load_disabled_if_in_none/yml/00-base.yml
@@ -1,23 +1,21 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
variables:
- variable:
- name: condition
+ - name: condition
type: string
description: No change
value:
- text: non
- - variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
type: string
description: No change
hidden: true
value:
- text: non
- - variable:
- name: mode_conteneur_actif2
+ - name: mode_conteneur_actif2
type: string
description: No change
hidden: true
diff --git a/tests/dictionaries/10load_disabled_if_in_twice/yml/00-base.yml b/tests/dictionaries/10load_disabled_if_in_twice/yml/00-base.yml
index 6673f7664..b3dc6f11d 100644
--- a/tests/dictionaries/10load_disabled_if_in_twice/yml/00-base.yml
+++ b/tests/dictionaries/10load_disabled_if_in_twice/yml/00-base.yml
@@ -1,15 +1,13 @@
version: '0.10'
variables:
- variable:
- name: my_var1
+ - name: my_var1
value:
- text: 'no'
-- variable:
- name: my_var2
+ - name: my_var2
value:
- text: 'no'
-- variable:
- name: my_var3
+ - name: my_var3
value:
- text: 'no'
constraints:
diff --git a/tests/dictionaries/10load_disabled_if_in_variable/yml/00-base.yml b/tests/dictionaries/10load_disabled_if_in_variable/yml/00-base.yml
index 111282ef1..676b05409 100644
--- a/tests/dictionaries/10load_disabled_if_in_variable/yml/00-base.yml
+++ b/tests/dictionaries/10load_disabled_if_in_variable/yml/00-base.yml
@@ -1,10 +1,10 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
variables:
- variable:
- name: condition
+ - name: condition
type: choice
description: No change
value:
@@ -17,14 +17,12 @@ variables:
text: "authentifi\xE9"
- type: string
text: aucun
- - variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
type: string
description: No change
value:
- text: tous
- - variable:
- name: mode_conteneur_actif2
+ - name: mode_conteneur_actif2
type: string
description: No change
value:
diff --git a/tests/dictionaries/10load_disabled_if_in_variable2/yml/00-base.yml b/tests/dictionaries/10load_disabled_if_in_variable2/yml/00-base.yml
index f01c4e5c8..4c58c2b42 100644
--- a/tests/dictionaries/10load_disabled_if_in_variable2/yml/00-base.yml
+++ b/tests/dictionaries/10load_disabled_if_in_variable2/yml/00-base.yml
@@ -1,10 +1,10 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
variables:
- variable:
- name: condition
+ - name: condition
type: choice
description: No change
value:
@@ -17,14 +17,12 @@ variables:
text: "authentifi\xE9"
- type: string
text: aucun
- - variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
type: string
description: No change
value:
- text: aucun
- - variable:
- name: mode_conteneur_actif2
+ - name: mode_conteneur_actif2
type: string
description: No change
value:
diff --git a/tests/dictionaries/10load_disabled_if_not_in_fallback/yml/00-base.yml b/tests/dictionaries/10load_disabled_if_not_in_fallback/yml/00-base.yml
index db3d69a30..cc91370c6 100644
--- a/tests/dictionaries/10load_disabled_if_not_in_fallback/yml/00-base.yml
+++ b/tests/dictionaries/10load_disabled_if_not_in_fallback/yml/00-base.yml
@@ -7,16 +7,15 @@ services:
text: /tmp/file1
variables:
- family:
- name: general
+ - name: general
variables:
- variable:
- name: condition
+ - name: condition
type: string
description: No change
value:
- text: 'no'
- - variable:
- name: disable_variable
+ - name: disable_variable
type: string
description: No change
value:
diff --git a/tests/dictionaries/10load_disabled_if_not_in_fallback_force/yml/00-base.yml b/tests/dictionaries/10load_disabled_if_not_in_fallback_force/yml/00-base.yml
index 003650f69..3efb01e4c 100644
--- a/tests/dictionaries/10load_disabled_if_not_in_fallback_force/yml/00-base.yml
+++ b/tests/dictionaries/10load_disabled_if_not_in_fallback_force/yml/00-base.yml
@@ -1,22 +1,20 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
variables:
- variable:
- name: condition
+ - name: condition
type: string
description: No change
value:
- text: non
- - variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
type: string
description: No change
value:
- text: non
- - variable:
- name: mode_conteneur_actif2
+ - name: mode_conteneur_actif2
type: string
description: No change
value:
diff --git a/tests/dictionaries/10load_disabledifin_fallback/yml/00-base.yml b/tests/dictionaries/10load_disabledifin_fallback/yml/00-base.yml
index b411d3d2f..d6b3612f0 100644
--- a/tests/dictionaries/10load_disabledifin_fallback/yml/00-base.yml
+++ b/tests/dictionaries/10load_disabledifin_fallback/yml/00-base.yml
@@ -1,22 +1,20 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
variables:
- variable:
- name: condition
+ - name: condition
type: string
description: No change
value:
- text: non
- - variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
type: string
description: No change
value:
- text: non
- - variable:
- name: mode_conteneur_actif2
+ - name: mode_conteneur_actif2
type: string
description: No change
value:
diff --git a/tests/dictionaries/10load_disabledifin_fallback_force/yml/00-base.yml b/tests/dictionaries/10load_disabledifin_fallback_force/yml/00-base.yml
index 467b11af4..620923a05 100644
--- a/tests/dictionaries/10load_disabledifin_fallback_force/yml/00-base.yml
+++ b/tests/dictionaries/10load_disabledifin_fallback_force/yml/00-base.yml
@@ -1,22 +1,20 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
variables:
- variable:
- name: condition
+ - name: condition
type: string
description: No change
value:
- text: non
- - variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
type: string
description: No change
value:
- text: non
- - variable:
- name: mode_conteneur_actif2
+ - name: mode_conteneur_actif2
type: string
description: No change
value:
diff --git a/tests/dictionaries/10load_disabledifin_whithouttype/yml/00-base.yml b/tests/dictionaries/10load_disabledifin_whithouttype/yml/00-base.yml
index 03452ef9e..089fa2bc2 100644
--- a/tests/dictionaries/10load_disabledifin_whithouttype/yml/00-base.yml
+++ b/tests/dictionaries/10load_disabledifin_whithouttype/yml/00-base.yml
@@ -1,22 +1,20 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
variables:
- variable:
- name: condition
+ - name: condition
type: string
description: No change
value:
- text: non
- - variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
type: string
description: No change
value:
- text: non
- - variable:
- name: mode_conteneur_actif2
+ - name: mode_conteneur_actif2
type: string
description: No change
value:
diff --git a/tests/dictionaries/10load_emptyvalue/yml/00-base.yml b/tests/dictionaries/10load_emptyvalue/yml/00-base.yml
index 729bd92d9..0d37928d2 100644
--- a/tests/dictionaries/10load_emptyvalue/yml/00-base.yml
+++ b/tests/dictionaries/10load_emptyvalue/yml/00-base.yml
@@ -1,16 +1,15 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
variables:
- variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
type: string
description: No change
value:
- text: null
- - variable:
- name: mode_conteneur_actif2
+ - name: mode_conteneur_actif2
type: string
description: No change
value:
diff --git a/tests/dictionaries/10load_frozenifin/yml/00-base.yml b/tests/dictionaries/10load_frozenifin/yml/00-base.yml
index 61de391ed..23b379e27 100644
--- a/tests/dictionaries/10load_frozenifin/yml/00-base.yml
+++ b/tests/dictionaries/10load_frozenifin/yml/00-base.yml
@@ -1,22 +1,20 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
variables:
- variable:
- name: condition
+ - name: condition
type: string
description: No change
value:
- text: non
- - variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
type: string
description: No change
value:
- text: non
- - variable:
- name: mode_conteneur_actif2
+ - name: mode_conteneur_actif2
type: string
description: No change
value:
diff --git a/tests/dictionaries/10load_frozenifin_auto/yml/00-base.yml b/tests/dictionaries/10load_frozenifin_auto/yml/00-base.yml
index ba8f4ab68..8d5caa2aa 100644
--- a/tests/dictionaries/10load_frozenifin_auto/yml/00-base.yml
+++ b/tests/dictionaries/10load_frozenifin_auto/yml/00-base.yml
@@ -1,22 +1,20 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
variables:
- variable:
- name: condition
+ - name: condition
type: string
description: No change
value:
- text: non
- - variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
type: string
description: No change
value:
- text: non
- - variable:
- name: mode_conteneur_actif2
+ - name: mode_conteneur_actif2
type: string
description: No change
value:
diff --git a/tests/dictionaries/10load_frozenifin_multiparam/yml/00-base.yml b/tests/dictionaries/10load_frozenifin_multiparam/yml/00-base.yml
index 0318f0a8a..5ab5e890b 100644
--- a/tests/dictionaries/10load_frozenifin_multiparam/yml/00-base.yml
+++ b/tests/dictionaries/10load_frozenifin_multiparam/yml/00-base.yml
@@ -1,10 +1,10 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
variables:
- variable:
- name: condition
+ - name: condition
type: choice
description: No change
value:
@@ -17,14 +17,12 @@ variables:
text: "authentifi\xE9"
- type: string
text: aucun
- - variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
type: string
description: No change
value:
- text: non
- - variable:
- name: mode_conteneur_actif2
+ - name: mode_conteneur_actif2
type: string
description: No change
value:
diff --git a/tests/dictionaries/10load_frozenifin_noexist/yml/00-base.yml b/tests/dictionaries/10load_frozenifin_noexist/yml/00-base.yml
index 87d68b6f3..e8b20f13c 100644
--- a/tests/dictionaries/10load_frozenifin_noexist/yml/00-base.yml
+++ b/tests/dictionaries/10load_frozenifin_noexist/yml/00-base.yml
@@ -1,10 +1,10 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
variables:
- variable:
- name: condition
+ - name: condition
type: choice
description: No change
value:
@@ -17,15 +17,13 @@ variables:
text: "authentifi\xE9"
- type: string
text: aucun
- - variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
type: string
description: No change
hidden: true
value:
- text: non
- - variable:
- name: mode_conteneur_actif2
+ - name: mode_conteneur_actif2
type: string
description: No change
hidden: true
diff --git a/tests/dictionaries/10load_frozenifin_variable/yml/00-base.yml b/tests/dictionaries/10load_frozenifin_variable/yml/00-base.yml
index edf408044..da4504ffb 100644
--- a/tests/dictionaries/10load_frozenifin_variable/yml/00-base.yml
+++ b/tests/dictionaries/10load_frozenifin_variable/yml/00-base.yml
@@ -1,10 +1,10 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
variables:
- variable:
- name: condition
+ - name: condition
type: choice
description: No change
value:
@@ -17,14 +17,12 @@ variables:
text: "authentifi\xE9"
- type: string
text: aucun
- - variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
type: string
description: No change
value:
- text: tous
- - variable:
- name: mode_conteneur_actif2
+ - name: mode_conteneur_actif2
type: string
description: No change
value:
diff --git a/tests/dictionaries/10load_frozenifnotin/yml/00-base.yml b/tests/dictionaries/10load_frozenifnotin/yml/00-base.yml
index cf97531b1..ed7b404b3 100644
--- a/tests/dictionaries/10load_frozenifnotin/yml/00-base.yml
+++ b/tests/dictionaries/10load_frozenifnotin/yml/00-base.yml
@@ -1,22 +1,20 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
variables:
- variable:
- name: condition
+ - name: condition
type: string
description: No change
value:
- text: non
- - variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
type: string
description: No change
value:
- text: non
- - variable:
- name: mode_conteneur_actif2
+ - name: mode_conteneur_actif2
type: string
description: No change
value:
diff --git a/tests/dictionaries/10load_frozenifnotin_noexist/yml/00-base.yml b/tests/dictionaries/10load_frozenifnotin_noexist/yml/00-base.yml
index 05b3bb06f..e0b8ade7c 100644
--- a/tests/dictionaries/10load_frozenifnotin_noexist/yml/00-base.yml
+++ b/tests/dictionaries/10load_frozenifnotin_noexist/yml/00-base.yml
@@ -1,10 +1,10 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
variables:
- variable:
- name: condition
+ - name: condition
type: choice
description: No change
value:
@@ -17,14 +17,12 @@ variables:
text: "authentifi\xE9"
- type: string
text: aucun
- - variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
type: string
description: No change
value:
- text: non
- - variable:
- name: mode_conteneur_actif2
+ - name: mode_conteneur_actif2
type: string
description: No change
value:
diff --git a/tests/dictionaries/10load_hidden_if_empty_family/yml/00-base.yml b/tests/dictionaries/10load_hidden_if_empty_family/yml/00-base.yml
index 28a8246f2..f35c09e26 100644
--- a/tests/dictionaries/10load_hidden_if_empty_family/yml/00-base.yml
+++ b/tests/dictionaries/10load_hidden_if_empty_family/yml/00-base.yml
@@ -1,29 +1,26 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
description: "G\xE9n\xE9ral"
variables:
- variable:
- name: condition
+ - name: condition
type: string
description: No change
value:
- text: non
- - variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
type: string
description: No change
value:
- text: non
- - variable:
- name: mode_conteneur_actif2
+ - name: mode_conteneur_actif2
type: string
description: No change
value:
- text: non
-- family:
- name: general2
+ - name: general2
description: "G\xE9n\xE9ral2"
constraints:
- condition:
diff --git a/tests/dictionaries/10load_hidden_if_family/yml/00-base.yml b/tests/dictionaries/10load_hidden_if_family/yml/00-base.yml
index 654cebf27..b3fd758b7 100644
--- a/tests/dictionaries/10load_hidden_if_family/yml/00-base.yml
+++ b/tests/dictionaries/10load_hidden_if_family/yml/00-base.yml
@@ -1,33 +1,30 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
description: "G\xE9n\xE9ral"
variables:
- variable:
- name: condition
+ - name: condition
type: string
description: No change
value:
- text: non
- - variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
type: string
description: No change
value:
- text: non
- - variable:
- name: mode_conteneur_actif2
+ - name: mode_conteneur_actif2
type: string
description: No change
value:
- text: non
-- family:
- name: general2
+ - name: general2
description: "G\xE9n\xE9ral2"
variables:
- variable:
- name: mode_conteneur_actif3
+ - name: mode_conteneur_actif3
type: string
description: No change
hidden: true
diff --git a/tests/dictionaries/10load_leadership/yml/00-base.yml b/tests/dictionaries/10load_leadership/yml/00-base.yml
index e72f25af8..1b78228fa 100644
--- a/tests/dictionaries/10load_leadership/yml/00-base.yml
+++ b/tests/dictionaries/10load_leadership/yml/00-base.yml
@@ -1,33 +1,30 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
variables:
- variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
type: string
description: No change
value:
- text: non
-- family:
- name: general1
+ - name: general1
variables:
- family:
- name: leader
+ - name: leader
description: leader
leadership: true
variables:
- variable:
- name: leader
+ - name: leader
type: string
description: leader
multi: true
- - variable:
- name: follower1
+ - name: follower1
type: string
description: follower1
- - variable:
- name: follower2
+ - name: follower2
type: string
description: follower2
constraints:
diff --git a/tests/dictionaries/10load_leadership_default_multi/yml/00-base.yml b/tests/dictionaries/10load_leadership_default_multi/yml/00-base.yml
index aff146cf6..b0eafc3b5 100644
--- a/tests/dictionaries/10load_leadership_default_multi/yml/00-base.yml
+++ b/tests/dictionaries/10load_leadership_default_multi/yml/00-base.yml
@@ -1,32 +1,30 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
variables:
- variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
type: string
description: leader
multi: true
value:
- text: non
- family:
- name: leader
+ - name: leader
description: leader
leadership: true
variables:
- variable:
- name: leader
+ - name: leader
type: string
description: leader
multi: true
- - variable:
- name: follower1
+ - name: follower1
type: string
description: follower1
value:
- text: value
- - variable:
- name: follower2
+ - name: follower2
type: string
description: follower2
diff --git a/tests/dictionaries/10load_leadership_default_submulti/yml/00-base.yml b/tests/dictionaries/10load_leadership_default_submulti/yml/00-base.yml
index 128e3a2ac..4f9433411 100644
--- a/tests/dictionaries/10load_leadership_default_submulti/yml/00-base.yml
+++ b/tests/dictionaries/10load_leadership_default_submulti/yml/00-base.yml
@@ -1,36 +1,34 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
variables:
- variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
type: string
description: leader
multi: true
value:
- text: non
- family:
- name: leader
+ - name: leader
description: leader
leadership: true
variables:
- variable:
- name: leader
+ - name: leader
type: string
description: leader
multi: true
value:
- text: leader
- - variable:
- name: follower1
+ - name: follower1
type: string
description: follower1
multi: true
value:
- text: value
- - variable:
- name: follower2
+ - name: follower2
type: string
description: follower2
multi: true
diff --git a/tests/dictionaries/10load_leadership_defaultmulti_leader/yml/00-base.yml b/tests/dictionaries/10load_leadership_defaultmulti_leader/yml/00-base.yml
index 35c7a213d..52d2cdc52 100644
--- a/tests/dictionaries/10load_leadership_defaultmulti_leader/yml/00-base.yml
+++ b/tests/dictionaries/10load_leadership_defaultmulti_leader/yml/00-base.yml
@@ -1,32 +1,30 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
variables:
- variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
type: string
description: leader
multi: true
value:
- text: non
- family:
- name: leader
+ - name: leader
description: leader
leadership: true
variables:
- variable:
- name: leader
+ - name: leader
type: string
description: leader
multi: true
value:
- text: value
- - variable:
- name: follower1
+ - name: follower1
type: string
description: follower1
- - variable:
- name: follower2
+ - name: follower2
type: string
description: follower2
diff --git a/tests/dictionaries/10load_leadership_description/yml/00-base.yml b/tests/dictionaries/10load_leadership_description/yml/00-base.yml
index 040df5e43..86be413d4 100644
--- a/tests/dictionaries/10load_leadership_description/yml/00-base.yml
+++ b/tests/dictionaries/10load_leadership_description/yml/00-base.yml
@@ -1,33 +1,30 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
variables:
- variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
type: string
description: No change
value:
- text: non
-- family:
- name: general1
+ - name: general1
variables:
- family:
- name: leader
+ - name: leader
description: other description
leadership: true
variables:
- variable:
- name: leader
+ - name: leader
type: string
description: leader
multi: true
- - variable:
- name: follower1
+ - name: follower1
type: string
description: follower1
- - variable:
- name: follower2
+ - name: follower2
type: string
description: follower2
constraints:
diff --git a/tests/dictionaries/10load_leadership_name/yml/00-base.yml b/tests/dictionaries/10load_leadership_name/yml/00-base.yml
index 58463da8b..44a09a07f 100644
--- a/tests/dictionaries/10load_leadership_name/yml/00-base.yml
+++ b/tests/dictionaries/10load_leadership_name/yml/00-base.yml
@@ -1,33 +1,30 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
variables:
- variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
type: string
description: No change
value:
- text: non
-- family:
- name: general1
+ - name: general1
variables:
- family:
- name: other_name
+ - name: other_name
description: other_name
leadership: true
variables:
- variable:
- name: leader
+ - name: leader
type: string
description: leader
multi: true
- - variable:
- name: follower1
+ - name: follower1
type: string
description: follower1
- - variable:
- name: follower2
+ - name: follower2
type: string
description: follower2
constraints:
diff --git a/tests/dictionaries/10load_leadership_submulti/yml/00-base.yml b/tests/dictionaries/10load_leadership_submulti/yml/00-base.yml
index 50bd0b71c..ff59fcfad 100644
--- a/tests/dictionaries/10load_leadership_submulti/yml/00-base.yml
+++ b/tests/dictionaries/10load_leadership_submulti/yml/00-base.yml
@@ -1,33 +1,30 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
variables:
- variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
type: string
description: No change
value:
- text: non
-- family:
- name: general1
+ - name: general1
variables:
- family:
- name: leader
+ - name: leader
description: leader
leadership: true
variables:
- variable:
- name: leader
+ - name: leader
type: string
description: leader
multi: true
- - variable:
- name: follower1
+ - name: follower1
type: string
description: follower1
- - variable:
- name: follower2
+ - name: follower2
type: string
description: follower2
multi: true
diff --git a/tests/dictionaries/10load_mandatoryifin/yml/00-base.yml b/tests/dictionaries/10load_mandatoryifin/yml/00-base.yml
index eb20e1e80..36d224d7d 100644
--- a/tests/dictionaries/10load_mandatoryifin/yml/00-base.yml
+++ b/tests/dictionaries/10load_mandatoryifin/yml/00-base.yml
@@ -1,22 +1,20 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
variables:
- variable:
- name: condition
+ - name: condition
type: string
description: No change
value:
- text: non
- - variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
type: string
description: No change
value:
- text: non
- - variable:
- name: mode_conteneur_actif2
+ - name: mode_conteneur_actif2
type: string
description: No change
value:
diff --git a/tests/dictionaries/10load_mandatoryifnotin_noexist/yml/00-base.yml b/tests/dictionaries/10load_mandatoryifnotin_noexist/yml/00-base.yml
index 284250b0c..2dc66e149 100644
--- a/tests/dictionaries/10load_mandatoryifnotin_noexist/yml/00-base.yml
+++ b/tests/dictionaries/10load_mandatoryifnotin_noexist/yml/00-base.yml
@@ -1,10 +1,10 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
variables:
- variable:
- name: condition
+ - name: condition
type: choice
description: No change
value:
@@ -17,15 +17,13 @@ variables:
text: "authentifi\xE9"
- type: string
text: aucun
- - variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
type: string
description: No change
hidden: true
value:
- text: non
- - variable:
- name: mode_conteneur_actif2
+ - name: mode_conteneur_actif2
type: string
description: No change
hidden: true
diff --git a/tests/dictionaries/10load_multivalue/yml/00-base.yml b/tests/dictionaries/10load_multivalue/yml/00-base.yml
index 4aeadffd6..1eece7892 100644
--- a/tests/dictionaries/10load_multivalue/yml/00-base.yml
+++ b/tests/dictionaries/10load_multivalue/yml/00-base.yml
@@ -1,10 +1,10 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
variables:
- variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
type: string
description: No change
hidden: true
diff --git a/tests/dictionaries/10valid_enum_accent/yml/00-base.yml b/tests/dictionaries/10valid_enum_accent/yml/00-base.yml
index 5acdb2b43..3672fcd54 100644
--- a/tests/dictionaries/10valid_enum_accent/yml/00-base.yml
+++ b/tests/dictionaries/10valid_enum_accent/yml/00-base.yml
@@ -1,21 +1,20 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
mode: expert
variables:
- variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
type: string
description: No change
value:
- text: non
-- family:
- name: enumfam
+ - name: enumfam
mode: expert
variables:
- variable:
- name: enumvar
+ - name: enumvar
type: choice
description: multi
help: bla bla bla
diff --git a/tests/dictionaries/10valid_enum_append/yml/00-base.yml b/tests/dictionaries/10valid_enum_append/yml/00-base.yml
index c62b7b756..f65dd9bd7 100644
--- a/tests/dictionaries/10valid_enum_append/yml/00-base.yml
+++ b/tests/dictionaries/10valid_enum_append/yml/00-base.yml
@@ -1,21 +1,20 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
mode: expert
variables:
- variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
type: string
description: No change
value:
- text: non
-- family:
- name: enumfam
+ - name: enumfam
mode: expert
variables:
- variable:
- name: enumvar
+ - name: enumvar
type: choice
description: multi
help: bla bla bla
diff --git a/tests/dictionaries/10valid_enum_append/yml/01-base.yml b/tests/dictionaries/10valid_enum_append/yml/01-base.yml
index b0c2f3807..4d9fe7ca9 100644
--- a/tests/dictionaries/10valid_enum_append/yml/01-base.yml
+++ b/tests/dictionaries/10valid_enum_append/yml/01-base.yml
@@ -1,10 +1,10 @@
version: '0.10'
variables:
- family:
- name: enumfam
+ - name: enumfam
variables:
- variable:
- name: enumvar
+ - name: enumvar
redefine: true
value:
- type: string
diff --git a/tests/dictionaries/10valid_enum_base/yml/00-base.yml b/tests/dictionaries/10valid_enum_base/yml/00-base.yml
index 138520141..548a64134 100644
--- a/tests/dictionaries/10valid_enum_base/yml/00-base.yml
+++ b/tests/dictionaries/10valid_enum_base/yml/00-base.yml
@@ -1,21 +1,20 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
mode: expert
variables:
- variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
type: string
description: No change
value:
- text: non
-- family:
- name: enumfam
+ - name: enumfam
mode: expert
variables:
- variable:
- name: enumvar
+ - name: enumvar
type: choice
description: multi
help: bla bla bla
diff --git a/tests/dictionaries/10valid_enum_base_no_mandatory/yml/00-base.yml b/tests/dictionaries/10valid_enum_base_no_mandatory/yml/00-base.yml
index f1c31a72c..8505546fd 100644
--- a/tests/dictionaries/10valid_enum_base_no_mandatory/yml/00-base.yml
+++ b/tests/dictionaries/10valid_enum_base_no_mandatory/yml/00-base.yml
@@ -1,21 +1,20 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
mode: expert
variables:
- variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
type: string
description: No change
value:
- text: non
-- family:
- name: enumfam
+ - name: enumfam
mode: expert
variables:
- variable:
- name: enumvar
+ - name: enumvar
mandatory: false
type: choice
value:
diff --git a/tests/dictionaries/10valid_enum_base_redefine/yml/00-base.yml b/tests/dictionaries/10valid_enum_base_redefine/yml/00-base.yml
index 257c21ccb..099c086d5 100644
--- a/tests/dictionaries/10valid_enum_base_redefine/yml/00-base.yml
+++ b/tests/dictionaries/10valid_enum_base_redefine/yml/00-base.yml
@@ -1,21 +1,20 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
mode: expert
variables:
- variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
type: string
description: No change
value:
- text: non
-- family:
- name: enumfam
+ - name: enumfam
mode: expert
variables:
- variable:
- name: enumvar2
+ - name: enumvar2
type: choice
description: multi
value:
@@ -28,8 +27,7 @@ variables:
text: b
- type: string
text: c
- - variable:
- name: enumvar
+ - name: enumvar
type: choice
description: multi
help: bla bla bla
diff --git a/tests/dictionaries/10valid_enum_base_redefine/yml/01-base.yml b/tests/dictionaries/10valid_enum_base_redefine/yml/01-base.yml
index eefbf6bb7..33fbfecef 100644
--- a/tests/dictionaries/10valid_enum_base_redefine/yml/01-base.yml
+++ b/tests/dictionaries/10valid_enum_base_redefine/yml/01-base.yml
@@ -1,11 +1,11 @@
version: '0.10'
variables:
- family:
- name: enumfam
+ - name: enumfam
mode: expert
variables:
- variable:
- name: enumvar
+ - name: enumvar
redefine: true
remove_check: true
remove_choice: true
diff --git a/tests/dictionaries/10valid_enum_leader/yml/00-base.yml b/tests/dictionaries/10valid_enum_leader/yml/00-base.yml
index 420074bcb..1c68fbaa1 100644
--- a/tests/dictionaries/10valid_enum_leader/yml/00-base.yml
+++ b/tests/dictionaries/10valid_enum_leader/yml/00-base.yml
@@ -1,26 +1,25 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
variables:
- variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
type: string
description: No change
value:
- text: non
- family:
- name: leader
+ - name: leader
description: leader
leadership: true
variables:
- variable:
- name: leader
+ - name: leader
type: string
description: leader
multi: true
- - variable:
- name: follower1
+ - name: follower1
type: choice
description: follower1
choice:
@@ -33,7 +32,6 @@ variables:
value:
- type: string
text: a
- - variable:
- name: follower2
+ - name: follower2
type: string
description: follower2
diff --git a/tests/dictionaries/10valid_enum_mandatory/yml/00-base.yml b/tests/dictionaries/10valid_enum_mandatory/yml/00-base.yml
index 413073b81..7739fc069 100644
--- a/tests/dictionaries/10valid_enum_mandatory/yml/00-base.yml
+++ b/tests/dictionaries/10valid_enum_mandatory/yml/00-base.yml
@@ -1,21 +1,20 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
mode: expert
variables:
- variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
type: string
description: No change
value:
- text: non
-- family:
- name: enumfam
+ - name: enumfam
mode: expert
variables:
- variable:
- name: enumvar
+ - name: enumvar
type: choice
description: multi
mandatory: true
diff --git a/tests/dictionaries/10valid_enum_multi/yml/00-base.yml b/tests/dictionaries/10valid_enum_multi/yml/00-base.yml
index bb2e37398..e2eb07582 100644
--- a/tests/dictionaries/10valid_enum_multi/yml/00-base.yml
+++ b/tests/dictionaries/10valid_enum_multi/yml/00-base.yml
@@ -1,16 +1,15 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
variables:
- variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
type: string
description: No change
value:
- text: non
- - variable:
- name: multi
+ - name: multi
type: choice
description: multi
multi: true
diff --git a/tests/dictionaries/10valid_enum_none/yml/00-base.yml b/tests/dictionaries/10valid_enum_none/yml/00-base.yml
index 472682df0..3555a39f8 100644
--- a/tests/dictionaries/10valid_enum_none/yml/00-base.yml
+++ b/tests/dictionaries/10valid_enum_none/yml/00-base.yml
@@ -1,21 +1,20 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
mode: expert
variables:
- variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
type: string
description: No change
value:
- text: non
-- family:
- name: enumfam
+ - name: enumfam
mode: expert
variables:
- variable:
- name: enumvar
+ - name: enumvar
type: choice
description: multi
help: bla bla bla
diff --git a/tests/dictionaries/10valid_enum_number/yml/00-base.yml b/tests/dictionaries/10valid_enum_number/yml/00-base.yml
index 18d19ef84..66d40458c 100644
--- a/tests/dictionaries/10valid_enum_number/yml/00-base.yml
+++ b/tests/dictionaries/10valid_enum_number/yml/00-base.yml
@@ -1,21 +1,20 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
mode: expert
variables:
- variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
type: string
description: No change
value:
- text: non
-- family:
- name: enumfam
+ - name: enumfam
mode: expert
variables:
- variable:
- name: enumvar
+ - name: enumvar
type: choice
description: enumvar
help: bla bla bla
diff --git a/tests/dictionaries/10valid_enum_numberdefault/yml/00-base.yml b/tests/dictionaries/10valid_enum_numberdefault/yml/00-base.yml
index d36c20e54..941696996 100644
--- a/tests/dictionaries/10valid_enum_numberdefault/yml/00-base.yml
+++ b/tests/dictionaries/10valid_enum_numberdefault/yml/00-base.yml
@@ -1,21 +1,20 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
mode: expert
variables:
- variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
type: string
description: No change
value:
- text: non
-- family:
- name: enumfam
+ - name: enumfam
mode: expert
variables:
- variable:
- name: enumvar
+ - name: enumvar
type: choice
description: enumvar
help: bla bla bla
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 7f790190d..d9194a907 100644
--- a/tests/dictionaries/10valid_enum_param_empty/yml/00-base.yml
+++ b/tests/dictionaries/10valid_enum_param_empty/yml/00-base.yml
@@ -1,21 +1,20 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
mode: expert
variables:
- variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
type: string
description: No change
value:
- text: non
-- family:
- name: enumfam
+ - name: enumfam
mode: expert
variables:
- variable:
- name: enumvar
+ - name: enumvar
type: choice
description: multi
help: bla bla bla
diff --git a/tests/dictionaries/10valid_enum_param_empty2/yml/00-base.yml b/tests/dictionaries/10valid_enum_param_empty2/yml/00-base.yml
index 7f790190d..d9194a907 100644
--- a/tests/dictionaries/10valid_enum_param_empty2/yml/00-base.yml
+++ b/tests/dictionaries/10valid_enum_param_empty2/yml/00-base.yml
@@ -1,21 +1,20 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
mode: expert
variables:
- variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
type: string
description: No change
value:
- text: non
-- family:
- name: enumfam
+ - name: enumfam
mode: expert
variables:
- variable:
- name: enumvar
+ - name: enumvar
type: choice
description: multi
help: bla bla bla
diff --git a/tests/dictionaries/10valid_enum_quote/yml/00-base.yml b/tests/dictionaries/10valid_enum_quote/yml/00-base.yml
index 60b3662f3..71819d043 100644
--- a/tests/dictionaries/10valid_enum_quote/yml/00-base.yml
+++ b/tests/dictionaries/10valid_enum_quote/yml/00-base.yml
@@ -1,21 +1,20 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
mode: expert
variables:
- variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
type: string
description: No change
value:
- text: non
-- family:
- name: enumfam
+ - name: enumfam
mode: expert
variables:
- variable:
- name: enumvar
+ - name: enumvar
type: choice
description: multi
help: bla bla bla
diff --git a/tests/dictionaries/10valid_enum_value/yml/00-base.yml b/tests/dictionaries/10valid_enum_value/yml/00-base.yml
index d968e1ac3..0336c28ea 100644
--- a/tests/dictionaries/10valid_enum_value/yml/00-base.yml
+++ b/tests/dictionaries/10valid_enum_value/yml/00-base.yml
@@ -1,10 +1,10 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
variables:
- variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
type: choice
description: No change
value:
diff --git a/tests/dictionaries/11disabled_if_in_filelist/yml/00-base.yml b/tests/dictionaries/11disabled_if_in_filelist/yml/00-base.yml
index 3cb038603..701215bd5 100644
--- a/tests/dictionaries/11disabled_if_in_filelist/yml/00-base.yml
+++ b/tests/dictionaries/11disabled_if_in_filelist/yml/00-base.yml
@@ -7,22 +7,20 @@ services:
text: /etc/file
variables:
- family:
- name: general
+ - name: general
variables:
- variable:
- name: condition
+ - name: condition
type: string
description: No change
value:
- text: non
- - variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
type: string
description: No change
value:
- text: non
- - variable:
- name: mode_conteneur_actif2
+ - name: mode_conteneur_actif2
type: boolean
description: No change
constraints:
diff --git a/tests/dictionaries/11disabled_if_in_filelist_boolean/yml/00-base.yml b/tests/dictionaries/11disabled_if_in_filelist_boolean/yml/00-base.yml
index 8665f13c2..956f4c937 100644
--- a/tests/dictionaries/11disabled_if_in_filelist_boolean/yml/00-base.yml
+++ b/tests/dictionaries/11disabled_if_in_filelist_boolean/yml/00-base.yml
@@ -7,10 +7,10 @@ services:
text: /tmp/file1
variables:
- family:
- name: general
+ - name: general
variables:
- variable:
- name: condition
+ - name: condition
type: boolean
constraints:
- condition:
diff --git a/tests/dictionaries/11disabled_if_in_filelist_boolean2/yml/00-base.yml b/tests/dictionaries/11disabled_if_in_filelist_boolean2/yml/00-base.yml
index 53d0fbdbe..700a65b1b 100644
--- a/tests/dictionaries/11disabled_if_in_filelist_boolean2/yml/00-base.yml
+++ b/tests/dictionaries/11disabled_if_in_filelist_boolean2/yml/00-base.yml
@@ -7,10 +7,10 @@ services:
text: /tmp/file1
variables:
- family:
- name: general
+ - name: general
variables:
- variable:
- name: condition
+ - name: condition
type: boolean
value:
- text: false
diff --git a/tests/dictionaries/11disabled_if_in_filelist_disabled/yml/00-base.yml b/tests/dictionaries/11disabled_if_in_filelist_disabled/yml/00-base.yml
index 37f9b2b17..c4710e6c5 100644
--- a/tests/dictionaries/11disabled_if_in_filelist_disabled/yml/00-base.yml
+++ b/tests/dictionaries/11disabled_if_in_filelist_disabled/yml/00-base.yml
@@ -7,22 +7,20 @@ services:
text: /etc/file
variables:
- family:
- name: general
+ - name: general
variables:
- variable:
- name: condition
+ - name: condition
type: string
description: No change
value:
- text: oui
- - variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
type: string
description: No change
value:
- text: non
- - variable:
- name: mode_conteneur_actif2
+ - name: mode_conteneur_actif2
type: string
description: No change
value:
diff --git a/tests/dictionaries/11disabled_if_in_filelist_multi/yml/00-base.yml b/tests/dictionaries/11disabled_if_in_filelist_multi/yml/00-base.yml
index ab1722b18..e461573f6 100644
--- a/tests/dictionaries/11disabled_if_in_filelist_multi/yml/00-base.yml
+++ b/tests/dictionaries/11disabled_if_in_filelist_multi/yml/00-base.yml
@@ -9,22 +9,20 @@ services:
text: /tmp/file2
variables:
- family:
- name: general
+ - name: general
variables:
- variable:
- name: condition
+ - name: condition
type: string
description: No change
value:
- text: non
- - variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
type: string
description: No change
value:
- text: non
- - variable:
- name: mode_conteneur_actif2
+ - name: mode_conteneur_actif2
type: string
description: No change
value:
diff --git a/tests/dictionaries/11disabled_if_in_filelist_same_name/yml/00-base.yml b/tests/dictionaries/11disabled_if_in_filelist_same_name/yml/00-base.yml
index f66fbd11e..181be9ea4 100644
--- a/tests/dictionaries/11disabled_if_in_filelist_same_name/yml/00-base.yml
+++ b/tests/dictionaries/11disabled_if_in_filelist_same_name/yml/00-base.yml
@@ -7,22 +7,20 @@ services:
text: /etc/file
variables:
- family:
- name: general
+ - name: general
variables:
- variable:
- name: condition
+ - name: condition
type: string
description: No change
value:
- text: non
- - variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
type: string
description: No change
value:
- text: non
- - variable:
- name: mode_conteneur_actif2
+ - name: mode_conteneur_actif2
type: boolean
description: No change
constraints:
diff --git a/tests/dictionaries/11disabledifin_filelist_notexist/yml/00-base.yml b/tests/dictionaries/11disabledifin_filelist_notexist/yml/00-base.yml
index d7e50dc5d..8d6c22565 100644
--- a/tests/dictionaries/11disabledifin_filelist_notexist/yml/00-base.yml
+++ b/tests/dictionaries/11disabledifin_filelist_notexist/yml/00-base.yml
@@ -7,23 +7,21 @@ services:
text: /tmp/file
variables:
- family:
- name: general
+ - name: general
variables:
- variable:
- name: condition
+ - name: condition
type: string
description: No change
value:
- text: non
- - variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
type: string
description: No change
hidden: true
value:
- text: non
- - variable:
- name: mode_conteneur_actif2
+ - name: mode_conteneur_actif2
type: string
description: No change
hidden: true
diff --git a/tests/dictionaries/11disabledifnotin_filelist_notexist/yml/00-base.yml b/tests/dictionaries/11disabledifnotin_filelist_notexist/yml/00-base.yml
index d7e50dc5d..8d6c22565 100644
--- a/tests/dictionaries/11disabledifnotin_filelist_notexist/yml/00-base.yml
+++ b/tests/dictionaries/11disabledifnotin_filelist_notexist/yml/00-base.yml
@@ -7,23 +7,21 @@ services:
text: /tmp/file
variables:
- family:
- name: general
+ - name: general
variables:
- variable:
- name: condition
+ - name: condition
type: string
description: No change
value:
- text: non
- - variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
type: string
description: No change
hidden: true
value:
- text: non
- - variable:
- name: mode_conteneur_actif2
+ - name: mode_conteneur_actif2
type: string
description: No change
hidden: true
diff --git a/tests/dictionaries/11disabledifnotin_filelist_notexist_multi/yml/00-base.yml b/tests/dictionaries/11disabledifnotin_filelist_notexist_multi/yml/00-base.yml
index 12b0dfb60..80c18510a 100644
--- a/tests/dictionaries/11disabledifnotin_filelist_notexist_multi/yml/00-base.yml
+++ b/tests/dictionaries/11disabledifnotin_filelist_notexist_multi/yml/00-base.yml
@@ -7,23 +7,21 @@ services:
text: /tmp/file
variables:
- family:
- name: general
+ - name: general
variables:
- variable:
- name: condition
+ - name: condition
type: string
description: No change
value:
- text: non
- - variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
type: string
description: No change
hidden: true
value:
- text: non
- - variable:
- name: mode_conteneur_actif2
+ - name: mode_conteneur_actif2
type: string
description: No change
hidden: true
diff --git a/tests/dictionaries/11disabledifnotin_filelist_notexist_validenum/yml/00-base.yml b/tests/dictionaries/11disabledifnotin_filelist_notexist_validenum/yml/00-base.yml
index 5d4505456..bd78bb6c0 100644
--- a/tests/dictionaries/11disabledifnotin_filelist_notexist_validenum/yml/00-base.yml
+++ b/tests/dictionaries/11disabledifnotin_filelist_notexist_validenum/yml/00-base.yml
@@ -7,10 +7,10 @@ services:
text: /tmp/file
variables:
- family:
- name: general
+ - name: general
variables:
- variable:
- name: condition
+ - name: condition
type: choice
description: No change
value:
@@ -21,15 +21,13 @@ variables:
text: non
- type: string
text: statique
- - variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
type: string
description: No change
hidden: true
value:
- text: non
- - variable:
- name: mode_conteneur_actif2
+ - name: mode_conteneur_actif2
type: string
description: No change
hidden: true
diff --git a/tests/dictionaries/11multi_disabled_if_in_filelist/yml/00-base.yml b/tests/dictionaries/11multi_disabled_if_in_filelist/yml/00-base.yml
index a944e756a..8e37465c3 100644
--- a/tests/dictionaries/11multi_disabled_if_in_filelist/yml/00-base.yml
+++ b/tests/dictionaries/11multi_disabled_if_in_filelist/yml/00-base.yml
@@ -7,17 +7,16 @@ services:
text: /tmp/file1
variables:
- family:
- name: general
+ - name: general
variables:
- variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
type: string
description: No change
hidden: true
value:
- text: non
- - variable:
- name: condition
+ - name: condition
type: string
description: No change
value:
diff --git a/tests/dictionaries/11valid_enum_function/yml/00-base.yml b/tests/dictionaries/11valid_enum_function/yml/00-base.yml
index e857d81d7..cd5c9698b 100644
--- a/tests/dictionaries/11valid_enum_function/yml/00-base.yml
+++ b/tests/dictionaries/11valid_enum_function/yml/00-base.yml
@@ -1,10 +1,10 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
variables:
- variable:
- name: var
+ - name: var
type: choice
description: New variable
value:
diff --git a/tests/dictionaries/11valid_enum_variable/yml/00-base.yml b/tests/dictionaries/11valid_enum_variable/yml/00-base.yml
index 221569dd8..8cfd8e528 100644
--- a/tests/dictionaries/11valid_enum_variable/yml/00-base.yml
+++ b/tests/dictionaries/11valid_enum_variable/yml/00-base.yml
@@ -1,10 +1,10 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
variables:
- variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
type: choice
description: No change
value:
@@ -13,8 +13,7 @@ variables:
choice:
- type: variable
text: var
- - variable:
- name: var
+ - name: var
type: string
description: New variable
multi: true
diff --git a/tests/dictionaries/20family_append/yml/00-base.yml b/tests/dictionaries/20family_append/yml/00-base.yml
index 626b838c6..1a667a33f 100644
--- a/tests/dictionaries/20family_append/yml/00-base.yml
+++ b/tests/dictionaries/20family_append/yml/00-base.yml
@@ -1,10 +1,10 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
variables:
- variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
type: string
description: No change
hidden: true
diff --git a/tests/dictionaries/20family_append/yml/01-base.yml b/tests/dictionaries/20family_append/yml/01-base.yml
index b6aeb4606..90d621cd6 100644
--- a/tests/dictionaries/20family_append/yml/01-base.yml
+++ b/tests/dictionaries/20family_append/yml/01-base.yml
@@ -1,10 +1,10 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
variables:
- variable:
- name: mode_conteneur_actif1
+ - name: mode_conteneur_actif1
type: string
description: No change
hidden: true
diff --git a/tests/dictionaries/20family_dynamic/yml/00-base.yml b/tests/dictionaries/20family_dynamic/yml/00-base.yml
index 40a9e605c..79509e6e7 100644
--- a/tests/dictionaries/20family_dynamic/yml/00-base.yml
+++ b/tests/dictionaries/20family_dynamic/yml/00-base.yml
@@ -1,21 +1,20 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
variables:
- variable:
- name: varname
+ - name: varname
type: string
description: No change
multi: true
value:
- text: val1
- text: val2
-- family:
- name: dyn
+ - name: dyn
dynamic: varname
variables:
- variable:
- name: vardyn
+ - name: vardyn
type: string
description: No change
diff --git a/tests/dictionaries/20family_dynamic_calc/yml/00-base.yml b/tests/dictionaries/20family_dynamic_calc/yml/00-base.yml
index 06a56fa64..2c64fe19c 100644
--- a/tests/dictionaries/20family_dynamic_calc/yml/00-base.yml
+++ b/tests/dictionaries/20family_dynamic_calc/yml/00-base.yml
@@ -1,31 +1,29 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
variables:
- variable:
- name: varname
+ - name: varname
type: string
description: No change
multi: true
value:
- text: val1
- text: val2
-- family:
- name: dyn
+ - name: dyn
dynamic: varname
variables:
- variable:
- name: vardyn
+ - name: vardyn
type: string
description: No change
value:
- text: val
-- family:
- name: new
+ - name: new
variables:
- variable:
- name: newvar
+ - name: newvar
type: string
description: No change
constraints:
diff --git a/tests/dictionaries/20family_dynamic_calc2/yml/00-base.yml b/tests/dictionaries/20family_dynamic_calc2/yml/00-base.yml
index 1737bcfa9..0de82adae 100644
--- a/tests/dictionaries/20family_dynamic_calc2/yml/00-base.yml
+++ b/tests/dictionaries/20family_dynamic_calc2/yml/00-base.yml
@@ -1,31 +1,29 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
variables:
- variable:
- name: varname
+ - name: varname
type: string
description: No change
multi: true
value:
- text: val1
- text: val2
-- family:
- name: dyn
+ - name: dyn
dynamic: varname
variables:
- variable:
- name: vardyn
+ - name: vardyn
type: string
description: No change
value:
- text: val
-- family:
- name: new
+ - name: new
variables:
- variable:
- name: newvar
+ - name: newvar
type: string
description: No change
constraints:
diff --git a/tests/dictionaries/20family_dynamic_calc_suffix/yml/00-base.yml b/tests/dictionaries/20family_dynamic_calc_suffix/yml/00-base.yml
index 80e57d12c..809ad98b8 100644
--- a/tests/dictionaries/20family_dynamic_calc_suffix/yml/00-base.yml
+++ b/tests/dictionaries/20family_dynamic_calc_suffix/yml/00-base.yml
@@ -1,31 +1,29 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
variables:
- variable:
- name: varname
+ - name: varname
type: string
description: No change
multi: true
value:
- text: val1
- text: val2
-- family:
- name: dyn
+ - name: dyn
dynamic: varname
variables:
- variable:
- name: vardyn
+ - name: vardyn
type: string
description: No change
value:
- text: val
-- family:
- name: new
+ - name: new
variables:
- variable:
- name: newvar
+ - name: newvar
type: string
description: No change
constraints:
diff --git a/tests/dictionaries/20family_dynamic_description/yml/00-base.yml b/tests/dictionaries/20family_dynamic_description/yml/00-base.yml
index d9a640b53..b52654ff9 100644
--- a/tests/dictionaries/20family_dynamic_description/yml/00-base.yml
+++ b/tests/dictionaries/20family_dynamic_description/yml/00-base.yml
@@ -1,22 +1,21 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
variables:
- variable:
- name: varname
+ - name: varname
type: string
description: No change
multi: true
value:
- text: val1
- text: val2
-- family:
- name: dyn
+ - name: dyn
description: 'Dyn '
dynamic: varname
variables:
- variable:
- name: vardyn
+ - name: vardyn
type: string
description: No change
diff --git a/tests/dictionaries/20family_dynamic_leadership/yml/00-base.yml b/tests/dictionaries/20family_dynamic_leadership/yml/00-base.yml
index 1379803aa..66a54915d 100644
--- a/tests/dictionaries/20family_dynamic_leadership/yml/00-base.yml
+++ b/tests/dictionaries/20family_dynamic_leadership/yml/00-base.yml
@@ -1,38 +1,35 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
variables:
- variable:
- name: varname
+ - name: varname
type: string
description: No change
multi: true
value:
- text: val1
- text: val2
-- family:
- name: dyn
+ - name: dyn
dynamic: varname
variables:
- variable:
- name: vardyn
+ - name: vardyn
type: string
description: No change
- family:
- name: leadership
+ - name: leadership
leadership: true
variables:
- variable:
- name: leader
+ - name: leader
type: string
description: leader
multi: true
- - variable:
- name: follower1
+ - name: follower1
type: string
description: follower1
- - variable:
- name: follower2
+ - name: follower2
type: string
description: follower2
diff --git a/tests/dictionaries/20family_dynamic_number/yml/00-base.yml b/tests/dictionaries/20family_dynamic_number/yml/00-base.yml
index 85555cc85..aacff3bae 100644
--- a/tests/dictionaries/20family_dynamic_number/yml/00-base.yml
+++ b/tests/dictionaries/20family_dynamic_number/yml/00-base.yml
@@ -1,31 +1,29 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
variables:
- variable:
- name: varname
+ - name: varname
type: number
description: No change
multi: true
value:
- text: '1'
- text: '2'
-- family:
- name: dyn
+ - name: dyn
dynamic: varname
variables:
- variable:
- name: vardyn
+ - name: vardyn
type: string
description: No change
value:
- text: val
-- family:
- name: new
+ - name: new
variables:
- variable:
- name: newvar
+ - name: newvar
type: string
description: No change
constraints:
diff --git a/tests/dictionaries/20family_empty/yml/00-base.yml b/tests/dictionaries/20family_empty/yml/00-base.yml
index 0913fb17e..c7a63454b 100644
--- a/tests/dictionaries/20family_empty/yml/00-base.yml
+++ b/tests/dictionaries/20family_empty/yml/00-base.yml
@@ -1,15 +1,14 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
variables:
- variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
type: string
description: No change
mode: basic
value:
- text: non
-- family:
- name: general2
+ - name: general2
help: family
diff --git a/tests/dictionaries/20family_hidden/yml/00-base.yml b/tests/dictionaries/20family_hidden/yml/00-base.yml
index 626b838c6..1a667a33f 100644
--- a/tests/dictionaries/20family_hidden/yml/00-base.yml
+++ b/tests/dictionaries/20family_hidden/yml/00-base.yml
@@ -1,10 +1,10 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
variables:
- variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
type: string
description: No change
hidden: true
diff --git a/tests/dictionaries/20family_hidden/yml/01-base.yml b/tests/dictionaries/20family_hidden/yml/01-base.yml
index a39ec3d2b..6eeb9c94d 100644
--- a/tests/dictionaries/20family_hidden/yml/01-base.yml
+++ b/tests/dictionaries/20family_hidden/yml/01-base.yml
@@ -1,5 +1,5 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
hidden: true
diff --git a/tests/dictionaries/20family_mode/yml/00-base.yml b/tests/dictionaries/20family_mode/yml/00-base.yml
index 6bc83e3b6..bb33b5b61 100644
--- a/tests/dictionaries/20family_mode/yml/00-base.yml
+++ b/tests/dictionaries/20family_mode/yml/00-base.yml
@@ -1,10 +1,10 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
variables:
- variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
type: string
description: No change
mode: basic
diff --git a/tests/dictionaries/20family_modeleadership/yml/00-base.yml b/tests/dictionaries/20family_modeleadership/yml/00-base.yml
index 64787ffae..f2945c6b9 100644
--- a/tests/dictionaries/20family_modeleadership/yml/00-base.yml
+++ b/tests/dictionaries/20family_modeleadership/yml/00-base.yml
@@ -1,30 +1,28 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
variables:
- variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
type: string
description: No change
value:
- text: non
- family:
- name: leader
+ - name: leader
description: leader
leadership: true
variables:
- variable:
- name: leader
+ - name: leader
type: string
description: leader
multi: true
- - variable:
- name: follower1
+ - name: follower1
type: string
description: follower1
- - variable:
- name: follower2
+ - name: follower2
type: string
description: follower2
mode: basic
diff --git a/tests/dictionaries/20notemplating/yml/00-base.yml b/tests/dictionaries/20notemplating/yml/00-base.yml
index f453f6ae3..8680646dd 100644
--- a/tests/dictionaries/20notemplating/yml/00-base.yml
+++ b/tests/dictionaries/20notemplating/yml/00-base.yml
@@ -7,10 +7,10 @@ services:
text: /etc/file
variables:
- family:
- name: general
+ - name: general
variables:
- variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
type: string
description: No change
value:
diff --git a/tests/dictionaries/20override/tiramisu/base.py b/tests/dictionaries/20override/tiramisu/base.py
index 38dcdc112..ec9e527ae 100644
--- a/tests/dictionaries/20override/tiramisu/base.py
+++ b/tests/dictionaries/20override/tiramisu/base.py
@@ -32,7 +32,7 @@ optiondescription_15 = OptionDescription(name="test_service", doc="test.service"
optiondescription_15.impl_set_information('type', "service")
option_11 = BoolOption(name="activate", doc="activate", default=True)
optiondescription_10 = OptionDescription(name="test2_service", doc="test2.service", children=[option_11])
-optiondescription_10.impl_set_information('engine', "jinja2")
+optiondescription_10.impl_set_information('engine', "jinja")
optiondescription_10.impl_set_information('name', "test2.service")
optiondescription_10.impl_set_information('source', "test2.service")
optiondescription_9 = OptionDescription(name="overrides", doc="overrides", children=[optiondescription_10])
diff --git a/tests/dictionaries/20override/tiramisu/multi.py b/tests/dictionaries/20override/tiramisu/multi.py
index 44afe45cc..890fce93a 100644
--- a/tests/dictionaries/20override/tiramisu/multi.py
+++ b/tests/dictionaries/20override/tiramisu/multi.py
@@ -32,7 +32,7 @@ optiondescription_28 = OptionDescription(name="test_service", doc="test.service"
optiondescription_28.impl_set_information('type', "service")
option_13 = BoolOption(name="activate", doc="activate", default=True)
optiondescription_12 = OptionDescription(name="test2_service", doc="test2.service", children=[option_13])
-optiondescription_12.impl_set_information('engine', "jinja2")
+optiondescription_12.impl_set_information('engine', "jinja")
optiondescription_12.impl_set_information('name', "test2.service")
optiondescription_12.impl_set_information('source', "test2.service")
optiondescription_11 = OptionDescription(name="overrides", doc="overrides", children=[optiondescription_12])
@@ -56,7 +56,7 @@ optiondescription_33 = OptionDescription(name="test_service", doc="test.service"
optiondescription_33.impl_set_information('type', "service")
option_23 = BoolOption(name="activate", doc="activate", default=True)
optiondescription_22 = OptionDescription(name="test2_service", doc="test2.service", children=[option_23])
-optiondescription_22.impl_set_information('engine', "jinja2")
+optiondescription_22.impl_set_information('engine', "jinja")
optiondescription_22.impl_set_information('name', "test2.service")
optiondescription_22.impl_set_information('source', "test2.service")
optiondescription_21 = OptionDescription(name="overrides", doc="overrides", children=[optiondescription_22])
diff --git a/tests/dictionaries/20override/xml/00-base.xml b/tests/dictionaries/20override/xml/00-base.xml
index 9a4092af0..9ae8d7bd2 100644
--- a/tests/dictionaries/20override/xml/00-base.xml
+++ b/tests/dictionaries/20override/xml/00-base.xml
@@ -5,7 +5,7 @@
-
+
diff --git a/tests/dictionaries/20override/yml/00-base.yml b/tests/dictionaries/20override/yml/00-base.yml
index b04094c25..88d8f874f 100644
--- a/tests/dictionaries/20override/yml/00-base.yml
+++ b/tests/dictionaries/20override/yml/00-base.yml
@@ -5,13 +5,13 @@ services:
override: null
- name: test2
override:
- - engine: jinja2
+ - engine: jinja
variables:
- family:
- name: general
+ - name: general
variables:
- variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
type: string
description: No change
value:
diff --git a/tests/dictionaries/20override_no_templating/yml/00-base.yml b/tests/dictionaries/20override_no_templating/yml/00-base.yml
index ded36057b..3761864a7 100644
--- a/tests/dictionaries/20override_no_templating/yml/00-base.yml
+++ b/tests/dictionaries/20override_no_templating/yml/00-base.yml
@@ -6,10 +6,10 @@ services:
- engine: none
variables:
- family:
- name: general
+ - name: general
variables:
- variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
type: string
description: No change
value:
diff --git a/tests/dictionaries/20override_source/yml/00-base.yml b/tests/dictionaries/20override_source/yml/00-base.yml
index 788bedffc..0a1c06c7e 100644
--- a/tests/dictionaries/20override_source/yml/00-base.yml
+++ b/tests/dictionaries/20override_source/yml/00-base.yml
@@ -6,10 +6,10 @@ services:
- source: test2.service
variables:
- family:
- name: general
+ - name: general
variables:
- variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
type: string
description: No change
value:
diff --git a/tests/dictionaries/21family_empty/yml/00-base.yml b/tests/dictionaries/21family_empty/yml/00-base.yml
index 450470cc2..a6df0e902 100644
--- a/tests/dictionaries/21family_empty/yml/00-base.yml
+++ b/tests/dictionaries/21family_empty/yml/00-base.yml
@@ -1,13 +1,12 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
variables:
- variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
type: string
description: No change
value:
- text: non
-- family:
- name: general1
+ - name: general1
diff --git a/tests/dictionaries/21family_empty_sub/yml/00-base.yml b/tests/dictionaries/21family_empty_sub/yml/00-base.yml
index fc8bae09d..b36c88eae 100644
--- a/tests/dictionaries/21family_empty_sub/yml/00-base.yml
+++ b/tests/dictionaries/21family_empty_sub/yml/00-base.yml
@@ -1,16 +1,15 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
variables:
- variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
type: string
description: No change
value:
- text: non
-- family:
- name: general1
+ - name: general1
variables:
- family:
- name: general2
+ - name: general2
diff --git a/tests/dictionaries/22provider_dynamic/yml/00-base.yml b/tests/dictionaries/22provider_dynamic/yml/00-base.yml
index 1095aacb3..4de8d1463 100644
--- a/tests/dictionaries/22provider_dynamic/yml/00-base.yml
+++ b/tests/dictionaries/22provider_dynamic/yml/00-base.yml
@@ -1,22 +1,21 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
variables:
- variable:
- name: varname
+ - name: varname
type: string
description: No change
multi: true
value:
- text: val1
- text: val2
-- family:
- name: dyn
+ - name: dyn
dynamic: varname
variables:
- variable:
- name: vardyn
+ - name: vardyn
type: string
description: No change
provider: dyn
diff --git a/tests/dictionaries/22provider_dynamic_2/yml/00-base.yml b/tests/dictionaries/22provider_dynamic_2/yml/00-base.yml
index 57d48d719..561eeaafb 100644
--- a/tests/dictionaries/22provider_dynamic_2/yml/00-base.yml
+++ b/tests/dictionaries/22provider_dynamic_2/yml/00-base.yml
@@ -1,7 +1,7 @@
version: '0.10'
variables:
- variable:
- name: varname
+ - name: varname
type: string
description: No change
multi: true
@@ -9,14 +9,14 @@ variables:
- text: val1
- text: val2
- family:
- name: general
+ - name: general
variables:
- family:
- name: dyn
+ - name: dyn
dynamic: varname
variables:
- variable:
- name: vardyn
+ - name: vardyn
type: string
description: No change
provider: dyn
diff --git a/tests/dictionaries/30mandatory_withoutvalue/yml/00-base.yml b/tests/dictionaries/30mandatory_withoutvalue/yml/00-base.yml
index 7fdf5daac..e0a669dc4 100644
--- a/tests/dictionaries/30mandatory_withoutvalue/yml/00-base.yml
+++ b/tests/dictionaries/30mandatory_withoutvalue/yml/00-base.yml
@@ -1,10 +1,10 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
variables:
- variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
type: string
description: No change
mandatory: true
diff --git a/tests/dictionaries/30mandatory_withoutvaluecalc/yml/00-base.yml b/tests/dictionaries/30mandatory_withoutvaluecalc/yml/00-base.yml
index 46a6d597d..c61afb972 100644
--- a/tests/dictionaries/30mandatory_withoutvaluecalc/yml/00-base.yml
+++ b/tests/dictionaries/30mandatory_withoutvaluecalc/yml/00-base.yml
@@ -1,10 +1,10 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
variables:
- variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
type: string
description: No change
hidden: true
diff --git a/tests/dictionaries/30mandatory_withvalue/yml/00-base.yml b/tests/dictionaries/30mandatory_withvalue/yml/00-base.yml
index 2a172e021..dfea92a24 100644
--- a/tests/dictionaries/30mandatory_withvalue/yml/00-base.yml
+++ b/tests/dictionaries/30mandatory_withvalue/yml/00-base.yml
@@ -1,10 +1,10 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
variables:
- variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
type: string
description: No change
value:
diff --git a/tests/dictionaries/30mandatory_withvaluecalc/yml/00-base.yml b/tests/dictionaries/30mandatory_withvaluecalc/yml/00-base.yml
index fea26fdff..5455b238d 100644
--- a/tests/dictionaries/30mandatory_withvaluecalc/yml/00-base.yml
+++ b/tests/dictionaries/30mandatory_withvaluecalc/yml/00-base.yml
@@ -1,10 +1,10 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
variables:
- variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
type: string
description: No change
constraints:
diff --git a/tests/dictionaries/40condition_base/yml/00-base.yml b/tests/dictionaries/40condition_base/yml/00-base.yml
index 9f319cfe4..fbb661e20 100644
--- a/tests/dictionaries/40condition_base/yml/00-base.yml
+++ b/tests/dictionaries/40condition_base/yml/00-base.yml
@@ -1,28 +1,25 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
variables:
- variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
type: string
description: No change
value:
- text: non
- - variable:
- name: condition
+ - name: condition
type: string
description: No change
value:
- text: non
- - variable:
- name: mode_conteneur_actif1
+ - name: mode_conteneur_actif1
type: string
description: No change
value:
- text: non
- - variable:
- name: mode_conteneur_actif2
+ - name: mode_conteneur_actif2
type: string
description: No change
value:
diff --git a/tests/dictionaries/40condition_base_add/yml/00-base.yml b/tests/dictionaries/40condition_base_add/yml/00-base.yml
index 9f319cfe4..fbb661e20 100644
--- a/tests/dictionaries/40condition_base_add/yml/00-base.yml
+++ b/tests/dictionaries/40condition_base_add/yml/00-base.yml
@@ -1,28 +1,25 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
variables:
- variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
type: string
description: No change
value:
- text: non
- - variable:
- name: condition
+ - name: condition
type: string
description: No change
value:
- text: non
- - variable:
- name: mode_conteneur_actif1
+ - name: mode_conteneur_actif1
type: string
description: No change
value:
- text: non
- - variable:
- name: mode_conteneur_actif2
+ - name: mode_conteneur_actif2
type: string
description: No change
value:
diff --git a/tests/dictionaries/40condition_base_add/yml/01-base.yml b/tests/dictionaries/40condition_base_add/yml/01-base.yml
index e8ca11272..15d413f0f 100644
--- a/tests/dictionaries/40condition_base_add/yml/01-base.yml
+++ b/tests/dictionaries/40condition_base_add/yml/01-base.yml
@@ -1,10 +1,10 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
variables:
- variable:
- name: condition
+ - name: condition
redefine: true
remove_condition: true
constraints:
diff --git a/tests/dictionaries/40condition_fallback/yml/00-base.yml b/tests/dictionaries/40condition_fallback/yml/00-base.yml
index 10b884274..ce3908992 100644
--- a/tests/dictionaries/40condition_fallback/yml/00-base.yml
+++ b/tests/dictionaries/40condition_fallback/yml/00-base.yml
@@ -1,31 +1,28 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
variables:
- variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
type: string
description: No change
value:
- text: non
- - variable:
- name: mode_conteneur_actif1
+ - name: mode_conteneur_actif1
type: string
description: No change
value:
- text: non
- - variable:
- name: mode_conteneur_actif2
+ - name: mode_conteneur_actif2
type: string
description: No change
value:
- text: non
-- family:
- name: disabled_family
+ - name: disabled_family
variables:
- variable:
- name: mode_conteneur_actif3
+ - name: mode_conteneur_actif3
type: string
description: No change
value:
diff --git a/tests/dictionaries/40condition_optional/yml/00-base.yml b/tests/dictionaries/40condition_optional/yml/00-base.yml
index 561b57094..77d3db6df 100644
--- a/tests/dictionaries/40condition_optional/yml/00-base.yml
+++ b/tests/dictionaries/40condition_optional/yml/00-base.yml
@@ -1,22 +1,20 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
variables:
- variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
type: string
description: No change
value:
- text: non
- - variable:
- name: condition
+ - name: condition
type: string
description: No change
value:
- text: non
- - variable:
- name: mode_conteneur_actif1
+ - name: mode_conteneur_actif1
type: string
description: No change
value:
diff --git a/tests/dictionaries/40condition_optional_empty/yml/00-base.yml b/tests/dictionaries/40condition_optional_empty/yml/00-base.yml
index 3445793ed..6a113b30e 100644
--- a/tests/dictionaries/40condition_optional_empty/yml/00-base.yml
+++ b/tests/dictionaries/40condition_optional_empty/yml/00-base.yml
@@ -1,22 +1,20 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
variables:
- variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
type: string
description: No change
value:
- text: non
- - variable:
- name: condition
+ - name: condition
type: string
description: No change
value:
- text: non
- - variable:
- name: mode_conteneur_actif1
+ - name: mode_conteneur_actif1
type: string
description: No change
value:
diff --git a/tests/dictionaries/40condition_optional_family/yml/00-base.yml b/tests/dictionaries/40condition_optional_family/yml/00-base.yml
index c4fc97863..45a98acea 100644
--- a/tests/dictionaries/40condition_optional_family/yml/00-base.yml
+++ b/tests/dictionaries/40condition_optional_family/yml/00-base.yml
@@ -1,13 +1,13 @@
version: '0.10'
variables:
- variable:
- name: condition
+ - name: condition
type: boolean
- family:
- name: general
+ - name: general
variables:
- variable:
- name: my_variable
+ - name: my_variable
constraints:
- condition:
- name: disabled_if_in
diff --git a/tests/dictionaries/40empty_param/yml/00_base.yml b/tests/dictionaries/40empty_param/yml/00_base.yml
index 07b741470..1956b1799 100644
--- a/tests/dictionaries/40empty_param/yml/00_base.yml
+++ b/tests/dictionaries/40empty_param/yml/00_base.yml
@@ -1,16 +1,15 @@
version: '0.10'
variables:
- family:
- name: proxy_authentifie
+ - name: proxy_authentifie
description: "proxy authentifi\xE9"
variables:
- variable:
- name: toto1
+ - name: toto1
type: port
description: "Port d'\xE9coute du proxy"
mode: expert
- - variable:
- name: toto2
+ - name: toto2
type: port
description: "Port d'\xE9coute du proxy NTLM"
mode: expert
diff --git a/tests/dictionaries/40empty_param2/yml/00_base.yml b/tests/dictionaries/40empty_param2/yml/00_base.yml
index b3771ddc2..3dc4b8f4b 100644
--- a/tests/dictionaries/40empty_param2/yml/00_base.yml
+++ b/tests/dictionaries/40empty_param2/yml/00_base.yml
@@ -1,16 +1,15 @@
version: '0.10'
variables:
- family:
- name: proxy_authentifie
+ - name: proxy_authentifie
description: "proxy authentifi\xE9"
variables:
- variable:
- name: toto1
+ - name: toto1
type: port
description: "Port d'\xE9coute du proxy"
mode: expert
- - variable:
- name: toto2
+ - name: toto2
type: port
description: "Port d'\xE9coute du proxy NTLM"
mode: expert
diff --git a/tests/dictionaries/40hidden_if_in_leadership_fallback/yml/00-base.yml b/tests/dictionaries/40hidden_if_in_leadership_fallback/yml/00-base.yml
index eb1586930..31445a8aa 100644
--- a/tests/dictionaries/40hidden_if_in_leadership_fallback/yml/00-base.yml
+++ b/tests/dictionaries/40hidden_if_in_leadership_fallback/yml/00-base.yml
@@ -1,28 +1,27 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
variables:
- variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
type: string
description: No change
value:
- text: non
- family:
- name: mode_conteneur_actif1
+ - name: mode_conteneur_actif1
description: No change
leadership: true
variables:
- variable:
- name: mode_conteneur_actif1
+ - name: mode_conteneur_actif1
type: string
description: No change
multi: true
value:
- text: non
- - variable:
- name: mode_conteneur_actif2
+ - name: mode_conteneur_actif2
type: string
description: No change
value:
diff --git a/tests/dictionaries/40ifin_leadership/yml/00-base.yml b/tests/dictionaries/40ifin_leadership/yml/00-base.yml
index 98ad2dd27..9ab512bce 100644
--- a/tests/dictionaries/40ifin_leadership/yml/00-base.yml
+++ b/tests/dictionaries/40ifin_leadership/yml/00-base.yml
@@ -1,36 +1,33 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
variables:
- variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
type: string
description: No change
value:
- text: non
- - variable:
- name: condition
+ - name: condition
type: string
description: condition
value:
- text: oui
- family:
- name: leader
+ - name: leader
description: leader
leadership: true
variables:
- variable:
- name: leader
+ - name: leader
type: string
description: leader
multi: true
- - variable:
- name: follower1
+ - name: follower1
type: string
description: follower1
- - variable:
- name: follower2
+ - name: follower2
type: string
description: follower2
constraints:
diff --git a/tests/dictionaries/40ifin_leadershipauto/yml/00-base.yml b/tests/dictionaries/40ifin_leadershipauto/yml/00-base.yml
index 08b31d087..ec048fb8e 100644
--- a/tests/dictionaries/40ifin_leadershipauto/yml/00-base.yml
+++ b/tests/dictionaries/40ifin_leadershipauto/yml/00-base.yml
@@ -6,39 +6,36 @@ services:
- text: /etc/mailname
variables:
- family:
- name: general
+ - name: general
variables:
- variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
type: string
description: No change
value:
- text: non
- - variable:
- name: condition
+ - name: condition
type: string
description: condition
value:
- text: oui
- family:
- name: leader
+ - name: leader
description: leader
leadership: true
variables:
- variable:
- name: leader
+ - name: leader
type: string
description: leader
multi: true
value:
- text: a
- - variable:
- name: follower1
+ - name: follower1
type: string
description: follower1
hidden: true
- - variable:
- name: follower2
+ - name: follower2
type: string
description: follower2
constraints:
diff --git a/tests/dictionaries/40ifin_leadershipauto_follower/tiramisu/base.py b/tests/dictionaries/40ifin_leadershipauto_follower/tiramisu/base.py
index 5cb5a475b..b6bc0ea2e 100644
--- a/tests/dictionaries/40ifin_leadershipauto_follower/tiramisu/base.py
+++ b/tests/dictionaries/40ifin_leadershipauto_follower/tiramisu/base.py
@@ -33,7 +33,7 @@ optiondescription_10.impl_set_information('source', "mailname")
option_15 = FilenameOption(name="name", doc="name", default="/etc/mailname2")
option_14 = BoolOption(name="activate", doc="activate", default=True)
optiondescription_13 = OptionDescription(name="mailname2", doc="mailname2", children=[option_15, option_14])
-optiondescription_13.impl_set_information('engine', "jinja2")
+optiondescription_13.impl_set_information('engine', "jinja")
optiondescription_13.impl_set_information('source', "mailname2")
optiondescription_9 = OptionDescription(name="files", doc="files", children=[optiondescription_10, optiondescription_13])
option_8 = BoolOption(name="activate", doc="activate", default=True)
diff --git a/tests/dictionaries/40ifin_leadershipauto_follower/tiramisu/multi.py b/tests/dictionaries/40ifin_leadershipauto_follower/tiramisu/multi.py
index 589e2e3f9..5098aaf58 100644
--- a/tests/dictionaries/40ifin_leadershipauto_follower/tiramisu/multi.py
+++ b/tests/dictionaries/40ifin_leadershipauto_follower/tiramisu/multi.py
@@ -33,7 +33,7 @@ optiondescription_17.impl_set_information('source', "mailname")
option_22 = FilenameOption(name="name", doc="name", default="/etc/mailname2")
option_21 = BoolOption(name="activate", doc="activate", default=True)
optiondescription_20 = OptionDescription(name="mailname2", doc="mailname2", children=[option_22, option_21])
-optiondescription_20.impl_set_information('engine', "jinja2")
+optiondescription_20.impl_set_information('engine', "jinja")
optiondescription_20.impl_set_information('source', "mailname2")
optiondescription_16 = OptionDescription(name="files", doc="files", children=[optiondescription_17, optiondescription_20])
option_15 = BoolOption(name="activate", doc="activate", default=True)
@@ -57,7 +57,7 @@ optiondescription_26.impl_set_information('source', "mailname")
option_31 = FilenameOption(name="name", doc="name", default="/etc/mailname2")
option_30 = BoolOption(name="activate", doc="activate", default=True)
optiondescription_29 = OptionDescription(name="mailname2", doc="mailname2", children=[option_31, option_30])
-optiondescription_29.impl_set_information('engine', "jinja2")
+optiondescription_29.impl_set_information('engine', "jinja")
optiondescription_29.impl_set_information('source', "mailname2")
optiondescription_25 = OptionDescription(name="files", doc="files", children=[optiondescription_26, optiondescription_29])
option_24 = BoolOption(name="activate", doc="activate", default=True)
diff --git a/tests/dictionaries/40ifin_leadershipauto_follower/xml/00-base.xml b/tests/dictionaries/40ifin_leadershipauto_follower/xml/00-base.xml
index cc748bbc0..50f8dcc3c 100644
--- a/tests/dictionaries/40ifin_leadershipauto_follower/xml/00-base.xml
+++ b/tests/dictionaries/40ifin_leadershipauto_follower/xml/00-base.xml
@@ -3,7 +3,7 @@
/etc/mailname
- /etc/mailname2
+ /etc/mailname2
diff --git a/tests/dictionaries/40ifin_leadershipauto_follower/yml/00-base.yml b/tests/dictionaries/40ifin_leadershipauto_follower/yml/00-base.yml
index d93382324..6b77fa272 100644
--- a/tests/dictionaries/40ifin_leadershipauto_follower/yml/00-base.yml
+++ b/tests/dictionaries/40ifin_leadershipauto_follower/yml/00-base.yml
@@ -4,43 +4,40 @@ services:
- name: test
file:
- text: /etc/mailname
- - engine: jinja2
+ - engine: jinja
text: /etc/mailname2
variables:
- family:
- name: general
+ - name: general
variables:
- variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
type: string
description: No change
value:
- text: non
- - variable:
- name: condition
+ - name: condition
type: string
description: condition
value:
- text: oui
- family:
- name: leader
+ - name: leader
description: leader
leadership: true
variables:
- variable:
- name: leader
+ - name: leader
type: string
description: leader
multi: true
value:
- text: a
- text: b
- - variable:
- name: follower1
+ - name: follower1
type: string
description: follower1
- - variable:
- name: follower2
+ - name: follower2
type: string
description: follower2
constraints:
diff --git a/tests/dictionaries/40ifin_multi/yml/00-base.yml b/tests/dictionaries/40ifin_multi/yml/00-base.yml
index 0dc4976ba..016e0d743 100644
--- a/tests/dictionaries/40ifin_multi/yml/00-base.yml
+++ b/tests/dictionaries/40ifin_multi/yml/00-base.yml
@@ -1,28 +1,26 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
variables:
- variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
type: string
description: No change
hidden: true
value:
- text: non
-- family:
- name: general2
+ - name: general2
hidden: true
variables:
- variable:
- name: mode_conteneur_actif2
+ - name: mode_conteneur_actif2
type: string
description: No change
hidden: true
value:
- text: non
- - variable:
- name: mode_conteneur_actif3
+ - name: mode_conteneur_actif3
type: string
description: No change
value:
diff --git a/tests/dictionaries/40ifin_multi2/yml/00-base.yml b/tests/dictionaries/40ifin_multi2/yml/00-base.yml
index 34b2a0bae..601363e7d 100644
--- a/tests/dictionaries/40ifin_multi2/yml/00-base.yml
+++ b/tests/dictionaries/40ifin_multi2/yml/00-base.yml
@@ -1,28 +1,26 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
variables:
- variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
type: string
description: No change
hidden: true
value:
- text: non
-- family:
- name: general2
+ - name: general2
hidden: true
variables:
- variable:
- name: mode_conteneur_actif2
+ - name: mode_conteneur_actif2
type: string
description: No change
hidden: true
value:
- text: oui
- - variable:
- name: mode_conteneur_actif3
+ - name: mode_conteneur_actif3
type: string
description: No change
value:
diff --git a/tests/dictionaries/40ifin_validenum/yml/00-base.yml b/tests/dictionaries/40ifin_validenum/yml/00-base.yml
index 0eee28cad..73092154d 100644
--- a/tests/dictionaries/40ifin_validenum/yml/00-base.yml
+++ b/tests/dictionaries/40ifin_validenum/yml/00-base.yml
@@ -1,26 +1,24 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
variables:
- variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
type: string
description: No change
value:
- text: non
-- family:
- name: general2
+ - name: general2
hidden: true
variables:
- variable:
- name: mode_conteneur_actif2
+ - name: mode_conteneur_actif2
type: string
description: No change
value:
- text: non
- - variable:
- name: mode_conteneur_actif3
+ - name: mode_conteneur_actif3
type: choice
description: No change
choice:
diff --git a/tests/dictionaries/40space_param/yml/00_base.yml b/tests/dictionaries/40space_param/yml/00_base.yml
index 667d51215..eda930e43 100644
--- a/tests/dictionaries/40space_param/yml/00_base.yml
+++ b/tests/dictionaries/40space_param/yml/00_base.yml
@@ -1,16 +1,15 @@
version: '0.10'
variables:
- family:
- name: proxy_authentifie
+ - name: proxy_authentifie
description: "proxy authentifi\xE9"
variables:
- variable:
- name: toto1
+ - name: toto1
type: port
description: "Port d'\xE9coute du proxy"
mode: expert
- - variable:
- name: toto2
+ - name: toto2
type: port
description: "Port d'\xE9coute du proxy NTLM"
mode: expert
diff --git a/tests/dictionaries/45extra_without_family/yml/00-base.yml b/tests/dictionaries/45extra_without_family/yml/00-base.yml
index f41d41d50..005da8b6b 100644
--- a/tests/dictionaries/45extra_without_family/yml/00-base.yml
+++ b/tests/dictionaries/45extra_without_family/yml/00-base.yml
@@ -6,6 +6,6 @@ services:
- text: /etc/file
variables:
- variable:
- name: my_var
+ - name: my_var
value:
- text: rougail
diff --git a/tests/dictionaries/45extra_without_family/yml/extra_dirs/extra/00-base.yml b/tests/dictionaries/45extra_without_family/yml/extra_dirs/extra/00-base.yml
index 8da448b2f..be4b476ed 100644
--- a/tests/dictionaries/45extra_without_family/yml/extra_dirs/extra/00-base.yml
+++ b/tests/dictionaries/45extra_without_family/yml/extra_dirs/extra/00-base.yml
@@ -1,7 +1,7 @@
version: '0.10'
variables:
- variable:
- name: my_var
+ - name: my_var
constraints:
- fill:
- name: calc_multi_condition
diff --git a/tests/dictionaries/45multi_family/yml/00-base.yml b/tests/dictionaries/45multi_family/yml/00-base.yml
index 9a9d81df0..b5b3a9c0e 100644
--- a/tests/dictionaries/45multi_family/yml/00-base.yml
+++ b/tests/dictionaries/45multi_family/yml/00-base.yml
@@ -1,10 +1,10 @@
version: '0.10'
variables:
- family:
- name: base
+ - name: base
variables:
- family:
- name: subfamily
+ - name: subfamily
variables:
- variable:
- name: variable
+ - name: variable
diff --git a/tests/dictionaries/45multi_family_basic/yml/00-base.yml b/tests/dictionaries/45multi_family_basic/yml/00-base.yml
index 194c7de3f..6759d2386 100644
--- a/tests/dictionaries/45multi_family_basic/yml/00-base.yml
+++ b/tests/dictionaries/45multi_family_basic/yml/00-base.yml
@@ -1,11 +1,11 @@
version: '0.10'
variables:
- family:
- name: base
+ - name: base
variables:
- family:
- name: subfamily
+ - name: subfamily
variables:
- variable:
- name: variable
+ - name: variable
mode: basic
diff --git a/tests/dictionaries/45multi_family_expert/yml/00-base.yml b/tests/dictionaries/45multi_family_expert/yml/00-base.yml
index df1c46e41..da5dd74cb 100644
--- a/tests/dictionaries/45multi_family_expert/yml/00-base.yml
+++ b/tests/dictionaries/45multi_family_expert/yml/00-base.yml
@@ -1,11 +1,11 @@
version: '0.10'
variables:
- family:
- name: base
+ - name: base
mode: expert
variables:
- family:
- name: subfamily
+ - name: subfamily
variables:
- variable:
- name: variable
+ - name: variable
diff --git a/tests/dictionaries/45multi_family_order/yml/00-base.yml b/tests/dictionaries/45multi_family_order/yml/00-base.yml
index f59392cd3..466fce279 100644
--- a/tests/dictionaries/45multi_family_order/yml/00-base.yml
+++ b/tests/dictionaries/45multi_family_order/yml/00-base.yml
@@ -1,16 +1,16 @@
version: '0.10'
variables:
- variable:
- name: variable1
+ - name: variable1
- family:
- name: base
+ - name: base
variables:
- variable:
- name: variable2
+ - name: variable2
- family:
- name: subfamily
+ - name: subfamily
variables:
- variable:
- name: variable3
+ - name: variable3
- variable:
- name: variable4
+ - name: variable4
diff --git a/tests/dictionaries/45without_family/yml/00-base.yml b/tests/dictionaries/45without_family/yml/00-base.yml
index ca4e4a910..a251d8952 100644
--- a/tests/dictionaries/45without_family/yml/00-base.yml
+++ b/tests/dictionaries/45without_family/yml/00-base.yml
@@ -1,4 +1,4 @@
version: '0.10'
variables:
- variable:
- name: variable
+ - name: variable
diff --git a/tests/dictionaries/50exists_exists/yml/00-base.yml b/tests/dictionaries/50exists_exists/yml/00-base.yml
index 3b03d29db..86fe7c3d9 100644
--- a/tests/dictionaries/50exists_exists/yml/00-base.yml
+++ b/tests/dictionaries/50exists_exists/yml/00-base.yml
@@ -1,10 +1,10 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
variables:
- variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
type: string
description: Description
hidden: true
diff --git a/tests/dictionaries/50exists_exists/yml/01-base.yml b/tests/dictionaries/50exists_exists/yml/01-base.yml
index e0598f557..92d13e303 100644
--- a/tests/dictionaries/50exists_exists/yml/01-base.yml
+++ b/tests/dictionaries/50exists_exists/yml/01-base.yml
@@ -1,10 +1,10 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
variables:
- variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
type: string
description: New description
exists: false
diff --git a/tests/dictionaries/50redefine_description/yml/00-base.yml b/tests/dictionaries/50redefine_description/yml/00-base.yml
index 7f2e268d0..8617016fb 100644
--- a/tests/dictionaries/50redefine_description/yml/00-base.yml
+++ b/tests/dictionaries/50redefine_description/yml/00-base.yml
@@ -1,10 +1,10 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
variables:
- variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
type: string
description: Redefine description
hidden: true
diff --git a/tests/dictionaries/50redefine_description/yml/01-redefine.yml b/tests/dictionaries/50redefine_description/yml/01-redefine.yml
index ed23428dd..8ed54937b 100644
--- a/tests/dictionaries/50redefine_description/yml/01-redefine.yml
+++ b/tests/dictionaries/50redefine_description/yml/01-redefine.yml
@@ -1,9 +1,9 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
variables:
- variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
redefine: true
description: Redefined
diff --git a/tests/dictionaries/51exists_nonexists/yml/00-base.yml b/tests/dictionaries/51exists_nonexists/yml/00-base.yml
index 3aac9fa5a..ae0a4ed9c 100644
--- a/tests/dictionaries/51exists_nonexists/yml/00-base.yml
+++ b/tests/dictionaries/51exists_nonexists/yml/00-base.yml
@@ -1,16 +1,15 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
variables:
- variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
type: string
description: Description
value:
- text: non
- - variable:
- name: mode_conteneur_actif1
+ - name: mode_conteneur_actif1
type: string
description: Description
hidden: true
diff --git a/tests/dictionaries/51exists_nonexists/yml/01-base.yml b/tests/dictionaries/51exists_nonexists/yml/01-base.yml
index 1f380af1e..f0aa5871a 100644
--- a/tests/dictionaries/51exists_nonexists/yml/01-base.yml
+++ b/tests/dictionaries/51exists_nonexists/yml/01-base.yml
@@ -1,10 +1,10 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
variables:
- variable:
- name: mode_conteneur_actif2
+ - name: mode_conteneur_actif2
type: string
description: New description
exists: false
diff --git a/tests/dictionaries/51exists_redefine/yml/00-base.yml b/tests/dictionaries/51exists_redefine/yml/00-base.yml
index 3b03d29db..86fe7c3d9 100644
--- a/tests/dictionaries/51exists_redefine/yml/00-base.yml
+++ b/tests/dictionaries/51exists_redefine/yml/00-base.yml
@@ -1,10 +1,10 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
variables:
- variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
type: string
description: Description
hidden: true
diff --git a/tests/dictionaries/51exists_redefine/yml/01-base.yml b/tests/dictionaries/51exists_redefine/yml/01-base.yml
index 884ca3612..f0f6dbe05 100644
--- a/tests/dictionaries/51exists_redefine/yml/01-base.yml
+++ b/tests/dictionaries/51exists_redefine/yml/01-base.yml
@@ -1,16 +1,15 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
variables:
- variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
redefine: true
exists: true
value:
- text: oui
- - variable:
- name: mode_conteneur_actif1
+ - name: mode_conteneur_actif1
redefine: true
exists: true
value:
diff --git a/tests/dictionaries/51redefine_auto/yml/00-base.yml b/tests/dictionaries/51redefine_auto/yml/00-base.yml
index ee8f248bb..29860799c 100644
--- a/tests/dictionaries/51redefine_auto/yml/00-base.yml
+++ b/tests/dictionaries/51redefine_auto/yml/00-base.yml
@@ -1,10 +1,10 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
variables:
- variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
type: string
description: No change
hidden: true
diff --git a/tests/dictionaries/51redefine_auto/yml/01-base.yml b/tests/dictionaries/51redefine_auto/yml/01-base.yml
index f7c6d6757..9eb1a949d 100644
--- a/tests/dictionaries/51redefine_auto/yml/01-base.yml
+++ b/tests/dictionaries/51redefine_auto/yml/01-base.yml
@@ -1,10 +1,10 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
variables:
- variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
redefine: true
constraints:
- fill:
diff --git a/tests/dictionaries/51redefine_autofill/yml/00-base.yml b/tests/dictionaries/51redefine_autofill/yml/00-base.yml
index e89279311..5d00bd41b 100644
--- a/tests/dictionaries/51redefine_autofill/yml/00-base.yml
+++ b/tests/dictionaries/51redefine_autofill/yml/00-base.yml
@@ -1,10 +1,10 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
variables:
- variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
type: string
description: No change
hidden: true
diff --git a/tests/dictionaries/51redefine_autofill/yml/01-base.yml b/tests/dictionaries/51redefine_autofill/yml/01-base.yml
index 632960297..030b5ef35 100644
--- a/tests/dictionaries/51redefine_autofill/yml/01-base.yml
+++ b/tests/dictionaries/51redefine_autofill/yml/01-base.yml
@@ -1,10 +1,10 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
variables:
- variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
redefine: true
hidden: false
constraints:
diff --git a/tests/dictionaries/51redefine_family/yml/00-base.yml b/tests/dictionaries/51redefine_family/yml/00-base.yml
index d16401c88..655ab1a2e 100644
--- a/tests/dictionaries/51redefine_family/yml/00-base.yml
+++ b/tests/dictionaries/51redefine_family/yml/00-base.yml
@@ -1,21 +1,20 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
variables:
- variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
type: string
description: No change
hidden: true
value:
- text: non
-- family:
- name: general2
+ - name: general2
hidden: true
variables:
- variable:
- name: mode_conteneur_actif2
+ - name: mode_conteneur_actif2
type: string
description: No change
hidden: true
diff --git a/tests/dictionaries/51redefine_family/yml/01-base.yml b/tests/dictionaries/51redefine_family/yml/01-base.yml
index aa1c94743..9648ba1f4 100644
--- a/tests/dictionaries/51redefine_family/yml/01-base.yml
+++ b/tests/dictionaries/51redefine_family/yml/01-base.yml
@@ -1,10 +1,10 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
variables:
- variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
redefine: true
value:
- text: non
diff --git a/tests/dictionaries/51redefine_fill/yml/00-base.yml b/tests/dictionaries/51redefine_fill/yml/00-base.yml
index e89279311..5d00bd41b 100644
--- a/tests/dictionaries/51redefine_fill/yml/00-base.yml
+++ b/tests/dictionaries/51redefine_fill/yml/00-base.yml
@@ -1,10 +1,10 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
variables:
- variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
type: string
description: No change
hidden: true
diff --git a/tests/dictionaries/51redefine_fill/yml/01-base.yml b/tests/dictionaries/51redefine_fill/yml/01-base.yml
index f7c6d6757..9eb1a949d 100644
--- a/tests/dictionaries/51redefine_fill/yml/01-base.yml
+++ b/tests/dictionaries/51redefine_fill/yml/01-base.yml
@@ -1,10 +1,10 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
variables:
- variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
redefine: true
constraints:
- fill:
diff --git a/tests/dictionaries/51redefine_fillauto/yml/00-base.yml b/tests/dictionaries/51redefine_fillauto/yml/00-base.yml
index 3cbf1cec0..b6feaad02 100644
--- a/tests/dictionaries/51redefine_fillauto/yml/00-base.yml
+++ b/tests/dictionaries/51redefine_fillauto/yml/00-base.yml
@@ -1,10 +1,10 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
variables:
- variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
type: string
description: No change
value:
diff --git a/tests/dictionaries/51redefine_fillauto/yml/01-base.yml b/tests/dictionaries/51redefine_fillauto/yml/01-base.yml
index ce08daf16..0882e44ed 100644
--- a/tests/dictionaries/51redefine_fillauto/yml/01-base.yml
+++ b/tests/dictionaries/51redefine_fillauto/yml/01-base.yml
@@ -1,10 +1,10 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
variables:
- variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
redefine: true
hidden: true
constraints:
diff --git a/tests/dictionaries/51redefine_help/yml/00-base.yml b/tests/dictionaries/51redefine_help/yml/00-base.yml
index e6b90cba5..6a7c12125 100644
--- a/tests/dictionaries/51redefine_help/yml/00-base.yml
+++ b/tests/dictionaries/51redefine_help/yml/00-base.yml
@@ -1,11 +1,11 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
help: redefine help family
variables:
- variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
type: string
description: redefine help
hidden: true
diff --git a/tests/dictionaries/51redefine_help/yml/01-base.yml b/tests/dictionaries/51redefine_help/yml/01-base.yml
index 98b2ee89e..9bd2da067 100644
--- a/tests/dictionaries/51redefine_help/yml/01-base.yml
+++ b/tests/dictionaries/51redefine_help/yml/01-base.yml
@@ -1,11 +1,11 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
help: redefine help family ok
variables:
- variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
redefine: true
hidden: true
help: redefine help ok
diff --git a/tests/dictionaries/51redefine_hidden/yml/00-base.yml b/tests/dictionaries/51redefine_hidden/yml/00-base.yml
index 9c25fcb86..e89816231 100644
--- a/tests/dictionaries/51redefine_hidden/yml/00-base.yml
+++ b/tests/dictionaries/51redefine_hidden/yml/00-base.yml
@@ -1,10 +1,10 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
variables:
- variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
type: string
description: Redefine hidden
value:
diff --git a/tests/dictionaries/51redefine_hidden/yml/01-redefine.yml b/tests/dictionaries/51redefine_hidden/yml/01-redefine.yml
index 259c0a9e3..22125d6b6 100644
--- a/tests/dictionaries/51redefine_hidden/yml/01-redefine.yml
+++ b/tests/dictionaries/51redefine_hidden/yml/01-redefine.yml
@@ -1,9 +1,9 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
variables:
- variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
redefine: true
hidden: true
diff --git a/tests/dictionaries/51redefine_multi/yml/00-base.yml b/tests/dictionaries/51redefine_multi/yml/00-base.yml
index 7f2e268d0..8617016fb 100644
--- a/tests/dictionaries/51redefine_multi/yml/00-base.yml
+++ b/tests/dictionaries/51redefine_multi/yml/00-base.yml
@@ -1,10 +1,10 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
variables:
- variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
type: string
description: Redefine description
hidden: true
diff --git a/tests/dictionaries/51redefine_multi/yml/01-redefine.yml b/tests/dictionaries/51redefine_multi/yml/01-redefine.yml
index 59c7ab9d5..3c964b27c 100644
--- a/tests/dictionaries/51redefine_multi/yml/01-redefine.yml
+++ b/tests/dictionaries/51redefine_multi/yml/01-redefine.yml
@@ -1,9 +1,9 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
variables:
- variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
redefine: true
multi: true
diff --git a/tests/dictionaries/51redefine_remove_condition/yml/00-base.yml b/tests/dictionaries/51redefine_remove_condition/yml/00-base.yml
index 4aad99224..fcaf88ede 100644
--- a/tests/dictionaries/51redefine_remove_condition/yml/00-base.yml
+++ b/tests/dictionaries/51redefine_remove_condition/yml/00-base.yml
@@ -1,29 +1,26 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
variables:
- variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
type: string
description: No change
value:
- text: non
- - variable:
- name: condition
+ - name: condition
type: string
description: No change
value:
- text: non
- - variable:
- name: mode_conteneur_actif1
+ - name: mode_conteneur_actif1
type: string
description: No change
hidden: true
value:
- text: non
- - variable:
- name: mode_conteneur_actif2
+ - name: mode_conteneur_actif2
type: string
description: No change
value:
diff --git a/tests/dictionaries/51redefine_remove_condition/yml/01-base.yml b/tests/dictionaries/51redefine_remove_condition/yml/01-base.yml
index 8507fc2b6..62c1c758b 100644
--- a/tests/dictionaries/51redefine_remove_condition/yml/01-base.yml
+++ b/tests/dictionaries/51redefine_remove_condition/yml/01-base.yml
@@ -1,9 +1,9 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
variables:
- variable:
- name: condition
+ - name: condition
redefine: true
remove_condition: true
diff --git a/tests/dictionaries/51redefine_remove_condition_filelist/yml/00-base.yml b/tests/dictionaries/51redefine_remove_condition_filelist/yml/00-base.yml
index e91ffdf91..706635492 100644
--- a/tests/dictionaries/51redefine_remove_condition_filelist/yml/00-base.yml
+++ b/tests/dictionaries/51redefine_remove_condition_filelist/yml/00-base.yml
@@ -7,29 +7,26 @@ services:
text: /etc/file
variables:
- family:
- name: general
+ - name: general
variables:
- variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
type: string
description: No change
value:
- text: non
- - variable:
- name: condition
+ - name: condition
type: string
description: No change
value:
- text: non
- - variable:
- name: mode_conteneur_actif1
+ - name: mode_conteneur_actif1
type: string
description: No change
hidden: true
value:
- text: non
- - variable:
- name: mode_conteneur_actif2
+ - name: mode_conteneur_actif2
type: string
description: No change
value:
diff --git a/tests/dictionaries/51redefine_remove_condition_filelist/yml/01-base.yml b/tests/dictionaries/51redefine_remove_condition_filelist/yml/01-base.yml
index 8507fc2b6..62c1c758b 100644
--- a/tests/dictionaries/51redefine_remove_condition_filelist/yml/01-base.yml
+++ b/tests/dictionaries/51redefine_remove_condition_filelist/yml/01-base.yml
@@ -1,9 +1,9 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
variables:
- variable:
- name: condition
+ - name: condition
redefine: true
remove_condition: true
diff --git a/tests/dictionaries/51redefine_removecondition_nonautofreeze/yml/00-base.yml b/tests/dictionaries/51redefine_removecondition_nonautofreeze/yml/00-base.yml
index 1f4c229f5..afe2337fb 100644
--- a/tests/dictionaries/51redefine_removecondition_nonautofreeze/yml/00-base.yml
+++ b/tests/dictionaries/51redefine_removecondition_nonautofreeze/yml/00-base.yml
@@ -1,25 +1,21 @@
version: '0.10'
variables:
- variable:
- name: my_var
+ - name: my_var
auto_freeze: true
value:
- text: 'no'
-- variable:
- name: condition
+ - name: condition
value:
- text: 'no'
-- variable:
- name: my_var1
+ - name: my_var1
hidden: true
value:
- text: 'no'
-- variable:
- name: my_var2
+ - name: my_var2
value:
- text: 'no'
-- variable:
- name: server_deployed
+ - name: server_deployed
type: boolean
hidden: true
value:
diff --git a/tests/dictionaries/51redefine_removecondition_nonautofreeze/yml/01-base.yml b/tests/dictionaries/51redefine_removecondition_nonautofreeze/yml/01-base.yml
index c5ec5e4df..33e83c42b 100644
--- a/tests/dictionaries/51redefine_removecondition_nonautofreeze/yml/01-base.yml
+++ b/tests/dictionaries/51redefine_removecondition_nonautofreeze/yml/01-base.yml
@@ -1,6 +1,6 @@
version: '0.10'
variables:
- variable:
- name: condition
+ - name: condition
redefine: true
remove_condition: true
diff --git a/tests/dictionaries/51redefine_validenum/yml/00-base.yml b/tests/dictionaries/51redefine_validenum/yml/00-base.yml
index fbc7d6d31..4b622be13 100644
--- a/tests/dictionaries/51redefine_validenum/yml/00-base.yml
+++ b/tests/dictionaries/51redefine_validenum/yml/00-base.yml
@@ -1,10 +1,10 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
variables:
- variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
type: choice
description: Redefine description
hidden: true
diff --git a/tests/dictionaries/51redefine_validenum/yml/01-redefine.yml b/tests/dictionaries/51redefine_validenum/yml/01-redefine.yml
index 558833db0..fa00dc985 100644
--- a/tests/dictionaries/51redefine_validenum/yml/01-redefine.yml
+++ b/tests/dictionaries/51redefine_validenum/yml/01-redefine.yml
@@ -1,10 +1,10 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
variables:
- variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
redefine: true
remove_check: true
remove_choice: true
diff --git a/tests/dictionaries/51redefine_value/yml/00-base.yml b/tests/dictionaries/51redefine_value/yml/00-base.yml
index bbd0fb1a4..2598efb1b 100644
--- a/tests/dictionaries/51redefine_value/yml/00-base.yml
+++ b/tests/dictionaries/51redefine_value/yml/00-base.yml
@@ -1,16 +1,15 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
variables:
- variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
type: string
description: Redefine value
value:
- text: non
- - variable:
- name: mode_conteneur_actif1
+ - name: mode_conteneur_actif1
type: string
description: Redefine value
hidden: true
diff --git a/tests/dictionaries/51redefine_value/yml/01-redefine.yml b/tests/dictionaries/51redefine_value/yml/01-redefine.yml
index f476c5915..65c45c76c 100644
--- a/tests/dictionaries/51redefine_value/yml/01-redefine.yml
+++ b/tests/dictionaries/51redefine_value/yml/01-redefine.yml
@@ -1,10 +1,10 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
variables:
- variable:
- name: mode_conteneur_actif1
+ - name: mode_conteneur_actif1
redefine: true
value:
- text: oui
diff --git a/tests/dictionaries/51remove_fill/yml/00-base.yml b/tests/dictionaries/51remove_fill/yml/00-base.yml
index f791a6454..efdaeea96 100644
--- a/tests/dictionaries/51remove_fill/yml/00-base.yml
+++ b/tests/dictionaries/51remove_fill/yml/00-base.yml
@@ -1,16 +1,15 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
variables:
- variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
type: string
description: No change
value:
- text: oui
- - variable:
- name: mode_conteneur_actif1
+ - name: mode_conteneur_actif1
type: string
description: No change
value:
diff --git a/tests/dictionaries/51remove_fill/yml/01-base.yml b/tests/dictionaries/51remove_fill/yml/01-base.yml
index e465102f1..144cc714d 100644
--- a/tests/dictionaries/51remove_fill/yml/01-base.yml
+++ b/tests/dictionaries/51remove_fill/yml/01-base.yml
@@ -1,9 +1,9 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
variables:
- variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
redefine: true
remove_fill: true
diff --git a/tests/dictionaries/52exists_redefine/yml/00-base.yml b/tests/dictionaries/52exists_redefine/yml/00-base.yml
index e57a4be34..74bb4d9a7 100644
--- a/tests/dictionaries/52exists_redefine/yml/00-base.yml
+++ b/tests/dictionaries/52exists_redefine/yml/00-base.yml
@@ -1,10 +1,10 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
variables:
- variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
type: string
description: Description
hidden: true
diff --git a/tests/dictionaries/52exists_redefine/yml/01-base.yml b/tests/dictionaries/52exists_redefine/yml/01-base.yml
index bde53b226..8695844ce 100644
--- a/tests/dictionaries/52exists_redefine/yml/01-base.yml
+++ b/tests/dictionaries/52exists_redefine/yml/01-base.yml
@@ -1,10 +1,10 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
variables:
- variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
description: New description
exists: false
redefine: true
diff --git a/tests/dictionaries/60action_external/yml/00-base.yml b/tests/dictionaries/60action_external/yml/00-base.yml
index 9b4819ab1..862ba9941 100644
--- a/tests/dictionaries/60action_external/yml/00-base.yml
+++ b/tests/dictionaries/60action_external/yml/00-base.yml
@@ -1,11 +1,11 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
description: "g\xE9n\xE9ral"
variables:
- variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
type: string
description: No change
hidden: true
diff --git a/tests/dictionaries/60action_external/yml/extra_dirs/extra/00-base.yml b/tests/dictionaries/60action_external/yml/extra_dirs/extra/00-base.yml
index 782aaa93f..14fab360e 100644
--- a/tests/dictionaries/60action_external/yml/extra_dirs/extra/00-base.yml
+++ b/tests/dictionaries/60action_external/yml/extra_dirs/extra/00-base.yml
@@ -1,16 +1,15 @@
version: '0.10'
variables:
- family:
- name: test
+ - name: test
variables:
- variable:
- name: delay
+ - name: delay
type: number
description: "d\xE9lai en minutes avant lancement"
value:
- text: 0
- - variable:
- name: calc_url
+ - name: calc_url
type: web_address
description: domain
hidden: true
diff --git a/tests/dictionaries/60extra_externalspacecondition/yml/00-base.yml b/tests/dictionaries/60extra_externalspacecondition/yml/00-base.yml
index 0a557329e..514a33f68 100644
--- a/tests/dictionaries/60extra_externalspacecondition/yml/00-base.yml
+++ b/tests/dictionaries/60extra_externalspacecondition/yml/00-base.yml
@@ -1,21 +1,19 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
description: "g\xE9n\xE9ral"
variables:
- variable:
- name: my_var
+ - name: my_var
auto_freeze: true
value:
- text: 'no'
- - variable:
- name: my_var1
+ - name: my_var1
hidden: true
value:
- text: 'no'
- - variable:
- name: server_deployed
+ - name: server_deployed
type: boolean
hidden: true
value:
diff --git a/tests/dictionaries/60extra_externalspacecondition/yml/extra_dirs/extra/00-base.yml b/tests/dictionaries/60extra_externalspacecondition/yml/extra_dirs/extra/00-base.yml
index 61462b062..6722541d2 100644
--- a/tests/dictionaries/60extra_externalspacecondition/yml/extra_dirs/extra/00-base.yml
+++ b/tests/dictionaries/60extra_externalspacecondition/yml/extra_dirs/extra/00-base.yml
@@ -1,15 +1,14 @@
version: '0.10'
variables:
- family:
- name: ejabberd
+ - name: ejabberd
variables:
- variable:
- name: description
+ - name: description
type: string
value:
- text: Exportation de la base de ejabberd
- - variable:
- name: day
+ - name: day
type: choice
mandatory: true
choice:
@@ -19,8 +18,7 @@ variables:
- text: monthly
value:
- text: none
- - variable:
- name: mode
+ - name: mode
type: choice
mandatory: true
value:
diff --git a/tests/dictionaries/60extra_externalspacecondition/yml/extra_dirs/extra1/00-base.yml b/tests/dictionaries/60extra_externalspacecondition/yml/extra_dirs/extra1/00-base.yml
index 4534c5b88..3cdccee77 100644
--- a/tests/dictionaries/60extra_externalspacecondition/yml/extra_dirs/extra1/00-base.yml
+++ b/tests/dictionaries/60extra_externalspacecondition/yml/extra_dirs/extra1/00-base.yml
@@ -1,10 +1,10 @@
version: '0.10'
variables:
- family:
- name: external
+ - name: external
variables:
- variable:
- name: description
+ - name: description
type: string
value:
- text: test
diff --git a/tests/dictionaries/60extra_help/yml/00-base.yml b/tests/dictionaries/60extra_help/yml/00-base.yml
index 5706d5388..cd09c05bb 100644
--- a/tests/dictionaries/60extra_help/yml/00-base.yml
+++ b/tests/dictionaries/60extra_help/yml/00-base.yml
@@ -6,18 +6,17 @@ services:
- text: /etc/mailname
variables:
- family:
- name: general
+ - name: general
description: "g\xE9n\xE9ral"
variables:
- variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
type: string
description: No change
hidden: true
value:
- text: non
- - variable:
- name: activer_ejabberd
+ - name: activer_ejabberd
type: string
description: No change
hidden: true
diff --git a/tests/dictionaries/60extra_help/yml/extra_dirs/extra/00-base.yml b/tests/dictionaries/60extra_help/yml/extra_dirs/extra/00-base.yml
index b844b250a..ad95d9286 100644
--- a/tests/dictionaries/60extra_help/yml/extra_dirs/extra/00-base.yml
+++ b/tests/dictionaries/60extra_help/yml/extra_dirs/extra/00-base.yml
@@ -1,15 +1,14 @@
version: '0.10'
variables:
- family:
- name: ejabberd
+ - name: ejabberd
variables:
- variable:
- name: description
+ - name: description
type: string
value:
- text: Exportation de la base de ejabberd
- - variable:
- name: day
+ - name: day
type: choice
help: Test help
mandatory: true
@@ -20,8 +19,7 @@ variables:
- text: monthly
value:
- text: none
- - variable:
- name: mode
+ - name: mode
type: choice
mandatory: true
value:
diff --git a/tests/dictionaries/60extra_leadership/tiramisu/base.py b/tests/dictionaries/60extra_leadership/tiramisu/base.py
index f34254a91..6ccc5c967 100644
--- a/tests/dictionaries/60extra_leadership/tiramisu/base.py
+++ b/tests/dictionaries/60extra_leadership/tiramisu/base.py
@@ -34,7 +34,7 @@ optiondescription_10.impl_set_information('source', "mailname")
option_15 = FilenameOption(name="name", doc="name", default="/etc/mailname2")
option_14 = BoolOption(name="activate", doc="activate", default=True)
optiondescription_13 = OptionDescription(name="mailname2", doc="mailname2", children=[option_15, option_14])
-optiondescription_13.impl_set_information('engine', "jinja2")
+optiondescription_13.impl_set_information('engine', "jinja")
optiondescription_13.impl_set_information('source', "mailname2")
optiondescription_9 = OptionDescription(name="files", doc="files", children=[optiondescription_10, optiondescription_13])
option_8 = BoolOption(name="activate", doc="activate", default=True)
diff --git a/tests/dictionaries/60extra_leadership/tiramisu/multi.py b/tests/dictionaries/60extra_leadership/tiramisu/multi.py
index 4f922d42b..464ced586 100644
--- a/tests/dictionaries/60extra_leadership/tiramisu/multi.py
+++ b/tests/dictionaries/60extra_leadership/tiramisu/multi.py
@@ -34,7 +34,7 @@ optiondescription_17.impl_set_information('source', "mailname")
option_22 = FilenameOption(name="name", doc="name", default="/etc/mailname2")
option_21 = BoolOption(name="activate", doc="activate", default=True)
optiondescription_20 = OptionDescription(name="mailname2", doc="mailname2", children=[option_22, option_21])
-optiondescription_20.impl_set_information('engine', "jinja2")
+optiondescription_20.impl_set_information('engine', "jinja")
optiondescription_20.impl_set_information('source', "mailname2")
optiondescription_16 = OptionDescription(name="files", doc="files", children=[optiondescription_17, optiondescription_20])
option_15 = BoolOption(name="activate", doc="activate", default=True)
@@ -59,7 +59,7 @@ optiondescription_26.impl_set_information('source', "mailname")
option_31 = FilenameOption(name="name", doc="name", default="/etc/mailname2")
option_30 = BoolOption(name="activate", doc="activate", default=True)
optiondescription_29 = OptionDescription(name="mailname2", doc="mailname2", children=[option_31, option_30])
-optiondescription_29.impl_set_information('engine', "jinja2")
+optiondescription_29.impl_set_information('engine', "jinja")
optiondescription_29.impl_set_information('source', "mailname2")
optiondescription_25 = OptionDescription(name="files", doc="files", children=[optiondescription_26, optiondescription_29])
option_24 = BoolOption(name="activate", doc="activate", default=True)
diff --git a/tests/dictionaries/60extra_leadership/xml/00-base.xml b/tests/dictionaries/60extra_leadership/xml/00-base.xml
index e6f1ef4eb..27b3570db 100644
--- a/tests/dictionaries/60extra_leadership/xml/00-base.xml
+++ b/tests/dictionaries/60extra_leadership/xml/00-base.xml
@@ -3,7 +3,7 @@
/etc/mailname
- /etc/mailname2
+ /etc/mailname2
diff --git a/tests/dictionaries/60extra_leadership/yml/00-base.yml b/tests/dictionaries/60extra_leadership/yml/00-base.yml
index 213a9f477..dcb0a2ddd 100644
--- a/tests/dictionaries/60extra_leadership/yml/00-base.yml
+++ b/tests/dictionaries/60extra_leadership/yml/00-base.yml
@@ -4,22 +4,21 @@ services:
- name: test
file:
- text: /etc/mailname
- - engine: jinja2
+ - engine: jinja
text: /etc/mailname2
variables:
- family:
- name: general
+ - name: general
description: "g\xE9n\xE9ral"
variables:
- variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
type: string
description: No change
hidden: true
value:
- text: non
- - variable:
- name: activer_ejabberd
+ - name: activer_ejabberd
type: string
description: No change
hidden: true
diff --git a/tests/dictionaries/60extra_leadership/yml/extra_dirs/extra/00-base.yml b/tests/dictionaries/60extra_leadership/yml/extra_dirs/extra/00-base.yml
index b0e456d4a..3cfc006d2 100644
--- a/tests/dictionaries/60extra_leadership/yml/extra_dirs/extra/00-base.yml
+++ b/tests/dictionaries/60extra_leadership/yml/extra_dirs/extra/00-base.yml
@@ -1,21 +1,20 @@
version: '0.10'
variables:
- family:
- name: ejabberd
+ - name: ejabberd
variables:
- family:
- name: leadership
+ - name: leadership
description: description
leadership: true
variables:
- variable:
- name: description
+ - name: description
type: string
multi: true
value:
- text: test
- - variable:
- name: mode
+ - name: mode
type: string
value:
- text: pre
diff --git a/tests/dictionaries/60extra_leadership_name/tiramisu/base.py b/tests/dictionaries/60extra_leadership_name/tiramisu/base.py
index f78235002..60e565950 100644
--- a/tests/dictionaries/60extra_leadership_name/tiramisu/base.py
+++ b/tests/dictionaries/60extra_leadership_name/tiramisu/base.py
@@ -34,7 +34,7 @@ optiondescription_10.impl_set_information('source', "mailname")
option_15 = FilenameOption(name="name", doc="name", default="/etc/mailname2")
option_14 = BoolOption(name="activate", doc="activate", default=True)
optiondescription_13 = OptionDescription(name="mailname2", doc="mailname2", children=[option_15, option_14])
-optiondescription_13.impl_set_information('engine', "jinja2")
+optiondescription_13.impl_set_information('engine', "jinja")
optiondescription_13.impl_set_information('source', "mailname2")
optiondescription_9 = OptionDescription(name="files", doc="files", children=[optiondescription_10, optiondescription_13])
option_8 = BoolOption(name="activate", doc="activate", default=True)
diff --git a/tests/dictionaries/60extra_leadership_name/tiramisu/multi.py b/tests/dictionaries/60extra_leadership_name/tiramisu/multi.py
index 70b73899e..9861f9366 100644
--- a/tests/dictionaries/60extra_leadership_name/tiramisu/multi.py
+++ b/tests/dictionaries/60extra_leadership_name/tiramisu/multi.py
@@ -34,7 +34,7 @@ optiondescription_17.impl_set_information('source', "mailname")
option_22 = FilenameOption(name="name", doc="name", default="/etc/mailname2")
option_21 = BoolOption(name="activate", doc="activate", default=True)
optiondescription_20 = OptionDescription(name="mailname2", doc="mailname2", children=[option_22, option_21])
-optiondescription_20.impl_set_information('engine', "jinja2")
+optiondescription_20.impl_set_information('engine', "jinja")
optiondescription_20.impl_set_information('source', "mailname2")
optiondescription_16 = OptionDescription(name="files", doc="files", children=[optiondescription_17, optiondescription_20])
option_15 = BoolOption(name="activate", doc="activate", default=True)
@@ -59,7 +59,7 @@ optiondescription_26.impl_set_information('source', "mailname")
option_31 = FilenameOption(name="name", doc="name", default="/etc/mailname2")
option_30 = BoolOption(name="activate", doc="activate", default=True)
optiondescription_29 = OptionDescription(name="mailname2", doc="mailname2", children=[option_31, option_30])
-optiondescription_29.impl_set_information('engine', "jinja2")
+optiondescription_29.impl_set_information('engine', "jinja")
optiondescription_29.impl_set_information('source', "mailname2")
optiondescription_25 = OptionDescription(name="files", doc="files", children=[optiondescription_26, optiondescription_29])
option_24 = BoolOption(name="activate", doc="activate", default=True)
diff --git a/tests/dictionaries/60extra_leadership_name/xml/00-base.xml b/tests/dictionaries/60extra_leadership_name/xml/00-base.xml
index e6f1ef4eb..27b3570db 100644
--- a/tests/dictionaries/60extra_leadership_name/xml/00-base.xml
+++ b/tests/dictionaries/60extra_leadership_name/xml/00-base.xml
@@ -3,7 +3,7 @@
/etc/mailname
- /etc/mailname2
+ /etc/mailname2
diff --git a/tests/dictionaries/60extra_leadership_name/yml/00-base.yml b/tests/dictionaries/60extra_leadership_name/yml/00-base.yml
index 213a9f477..dcb0a2ddd 100644
--- a/tests/dictionaries/60extra_leadership_name/yml/00-base.yml
+++ b/tests/dictionaries/60extra_leadership_name/yml/00-base.yml
@@ -4,22 +4,21 @@ services:
- name: test
file:
- text: /etc/mailname
- - engine: jinja2
+ - engine: jinja
text: /etc/mailname2
variables:
- family:
- name: general
+ - name: general
description: "g\xE9n\xE9ral"
variables:
- variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
type: string
description: No change
hidden: true
value:
- text: non
- - variable:
- name: activer_ejabberd
+ - name: activer_ejabberd
type: string
description: No change
hidden: true
diff --git a/tests/dictionaries/60extra_leadership_name/yml/extra_dirs/extra/00-base.yml b/tests/dictionaries/60extra_leadership_name/yml/extra_dirs/extra/00-base.yml
index fb553d04a..02e6c8933 100644
--- a/tests/dictionaries/60extra_leadership_name/yml/extra_dirs/extra/00-base.yml
+++ b/tests/dictionaries/60extra_leadership_name/yml/extra_dirs/extra/00-base.yml
@@ -1,21 +1,20 @@
version: '0.10'
variables:
- family:
- name: ejabberd
+ - name: ejabberd
variables:
- family:
- name: new_name
+ - name: new_name
description: new_name
leadership: true
variables:
- variable:
- name: description
+ - name: description
type: string
multi: true
value:
- text: test
- - variable:
- name: mode
+ - name: mode
type: string
value:
- text: pre
diff --git a/tests/dictionaries/60extra_leadership_name_item/tiramisu/base.py b/tests/dictionaries/60extra_leadership_name_item/tiramisu/base.py
index f78235002..60e565950 100644
--- a/tests/dictionaries/60extra_leadership_name_item/tiramisu/base.py
+++ b/tests/dictionaries/60extra_leadership_name_item/tiramisu/base.py
@@ -34,7 +34,7 @@ optiondescription_10.impl_set_information('source', "mailname")
option_15 = FilenameOption(name="name", doc="name", default="/etc/mailname2")
option_14 = BoolOption(name="activate", doc="activate", default=True)
optiondescription_13 = OptionDescription(name="mailname2", doc="mailname2", children=[option_15, option_14])
-optiondescription_13.impl_set_information('engine', "jinja2")
+optiondescription_13.impl_set_information('engine', "jinja")
optiondescription_13.impl_set_information('source', "mailname2")
optiondescription_9 = OptionDescription(name="files", doc="files", children=[optiondescription_10, optiondescription_13])
option_8 = BoolOption(name="activate", doc="activate", default=True)
diff --git a/tests/dictionaries/60extra_leadership_name_item/tiramisu/multi.py b/tests/dictionaries/60extra_leadership_name_item/tiramisu/multi.py
index 70b73899e..9861f9366 100644
--- a/tests/dictionaries/60extra_leadership_name_item/tiramisu/multi.py
+++ b/tests/dictionaries/60extra_leadership_name_item/tiramisu/multi.py
@@ -34,7 +34,7 @@ optiondescription_17.impl_set_information('source', "mailname")
option_22 = FilenameOption(name="name", doc="name", default="/etc/mailname2")
option_21 = BoolOption(name="activate", doc="activate", default=True)
optiondescription_20 = OptionDescription(name="mailname2", doc="mailname2", children=[option_22, option_21])
-optiondescription_20.impl_set_information('engine', "jinja2")
+optiondescription_20.impl_set_information('engine', "jinja")
optiondescription_20.impl_set_information('source', "mailname2")
optiondescription_16 = OptionDescription(name="files", doc="files", children=[optiondescription_17, optiondescription_20])
option_15 = BoolOption(name="activate", doc="activate", default=True)
@@ -59,7 +59,7 @@ optiondescription_26.impl_set_information('source', "mailname")
option_31 = FilenameOption(name="name", doc="name", default="/etc/mailname2")
option_30 = BoolOption(name="activate", doc="activate", default=True)
optiondescription_29 = OptionDescription(name="mailname2", doc="mailname2", children=[option_31, option_30])
-optiondescription_29.impl_set_information('engine', "jinja2")
+optiondescription_29.impl_set_information('engine', "jinja")
optiondescription_29.impl_set_information('source', "mailname2")
optiondescription_25 = OptionDescription(name="files", doc="files", children=[optiondescription_26, optiondescription_29])
option_24 = BoolOption(name="activate", doc="activate", default=True)
diff --git a/tests/dictionaries/60extra_leadership_name_item/xml/00-base.xml b/tests/dictionaries/60extra_leadership_name_item/xml/00-base.xml
index e6f1ef4eb..27b3570db 100644
--- a/tests/dictionaries/60extra_leadership_name_item/xml/00-base.xml
+++ b/tests/dictionaries/60extra_leadership_name_item/xml/00-base.xml
@@ -3,7 +3,7 @@
/etc/mailname
- /etc/mailname2
+ /etc/mailname2
diff --git a/tests/dictionaries/60extra_leadership_name_item/yml/00-base.yml b/tests/dictionaries/60extra_leadership_name_item/yml/00-base.yml
index 213a9f477..dcb0a2ddd 100644
--- a/tests/dictionaries/60extra_leadership_name_item/yml/00-base.yml
+++ b/tests/dictionaries/60extra_leadership_name_item/yml/00-base.yml
@@ -4,22 +4,21 @@ services:
- name: test
file:
- text: /etc/mailname
- - engine: jinja2
+ - engine: jinja
text: /etc/mailname2
variables:
- family:
- name: general
+ - name: general
description: "g\xE9n\xE9ral"
variables:
- variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
type: string
description: No change
hidden: true
value:
- text: non
- - variable:
- name: activer_ejabberd
+ - name: activer_ejabberd
type: string
description: No change
hidden: true
diff --git a/tests/dictionaries/60extra_leadership_name_item/yml/extra_dirs/extra/00-base.yml b/tests/dictionaries/60extra_leadership_name_item/yml/extra_dirs/extra/00-base.yml
index fb553d04a..02e6c8933 100644
--- a/tests/dictionaries/60extra_leadership_name_item/yml/extra_dirs/extra/00-base.yml
+++ b/tests/dictionaries/60extra_leadership_name_item/yml/extra_dirs/extra/00-base.yml
@@ -1,21 +1,20 @@
version: '0.10'
variables:
- family:
- name: ejabberd
+ - name: ejabberd
variables:
- family:
- name: new_name
+ - name: new_name
description: new_name
leadership: true
variables:
- variable:
- name: description
+ - name: description
type: string
multi: true
value:
- text: test
- - variable:
- name: mode
+ - name: mode
type: string
value:
- text: pre
diff --git a/tests/dictionaries/60extra_leadership_valid_enum/tiramisu/base.py b/tests/dictionaries/60extra_leadership_valid_enum/tiramisu/base.py
index c17c10676..8c9718f6b 100644
--- a/tests/dictionaries/60extra_leadership_valid_enum/tiramisu/base.py
+++ b/tests/dictionaries/60extra_leadership_valid_enum/tiramisu/base.py
@@ -34,7 +34,7 @@ optiondescription_10.impl_set_information('source', "mailname")
option_15 = FilenameOption(name="name", doc="name", default="/etc/mailname2")
option_14 = BoolOption(name="activate", doc="activate", default=True)
optiondescription_13 = OptionDescription(name="mailname2", doc="mailname2", children=[option_15, option_14])
-optiondescription_13.impl_set_information('engine', "jinja2")
+optiondescription_13.impl_set_information('engine', "jinja")
optiondescription_13.impl_set_information('source', "mailname2")
optiondescription_9 = OptionDescription(name="files", doc="files", children=[optiondescription_10, optiondescription_13])
option_8 = BoolOption(name="activate", doc="activate", default=True)
diff --git a/tests/dictionaries/60extra_leadership_valid_enum/tiramisu/multi.py b/tests/dictionaries/60extra_leadership_valid_enum/tiramisu/multi.py
index ef3ee9357..f5851a981 100644
--- a/tests/dictionaries/60extra_leadership_valid_enum/tiramisu/multi.py
+++ b/tests/dictionaries/60extra_leadership_valid_enum/tiramisu/multi.py
@@ -34,7 +34,7 @@ optiondescription_17.impl_set_information('source', "mailname")
option_22 = FilenameOption(name="name", doc="name", default="/etc/mailname2")
option_21 = BoolOption(name="activate", doc="activate", default=True)
optiondescription_20 = OptionDescription(name="mailname2", doc="mailname2", children=[option_22, option_21])
-optiondescription_20.impl_set_information('engine', "jinja2")
+optiondescription_20.impl_set_information('engine', "jinja")
optiondescription_20.impl_set_information('source', "mailname2")
optiondescription_16 = OptionDescription(name="files", doc="files", children=[optiondescription_17, optiondescription_20])
option_15 = BoolOption(name="activate", doc="activate", default=True)
@@ -59,7 +59,7 @@ optiondescription_26.impl_set_information('source', "mailname")
option_31 = FilenameOption(name="name", doc="name", default="/etc/mailname2")
option_30 = BoolOption(name="activate", doc="activate", default=True)
optiondescription_29 = OptionDescription(name="mailname2", doc="mailname2", children=[option_31, option_30])
-optiondescription_29.impl_set_information('engine', "jinja2")
+optiondescription_29.impl_set_information('engine', "jinja")
optiondescription_29.impl_set_information('source', "mailname2")
optiondescription_25 = OptionDescription(name="files", doc="files", children=[optiondescription_26, optiondescription_29])
option_24 = BoolOption(name="activate", doc="activate", default=True)
diff --git a/tests/dictionaries/60extra_leadership_valid_enum/xml/00-base.xml b/tests/dictionaries/60extra_leadership_valid_enum/xml/00-base.xml
index e6f1ef4eb..27b3570db 100644
--- a/tests/dictionaries/60extra_leadership_valid_enum/xml/00-base.xml
+++ b/tests/dictionaries/60extra_leadership_valid_enum/xml/00-base.xml
@@ -3,7 +3,7 @@
/etc/mailname
- /etc/mailname2
+ /etc/mailname2
diff --git a/tests/dictionaries/60extra_leadership_valid_enum/yml/00-base.yml b/tests/dictionaries/60extra_leadership_valid_enum/yml/00-base.yml
index 213a9f477..dcb0a2ddd 100644
--- a/tests/dictionaries/60extra_leadership_valid_enum/yml/00-base.yml
+++ b/tests/dictionaries/60extra_leadership_valid_enum/yml/00-base.yml
@@ -4,22 +4,21 @@ services:
- name: test
file:
- text: /etc/mailname
- - engine: jinja2
+ - engine: jinja
text: /etc/mailname2
variables:
- family:
- name: general
+ - name: general
description: "g\xE9n\xE9ral"
variables:
- variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
type: string
description: No change
hidden: true
value:
- text: non
- - variable:
- name: activer_ejabberd
+ - name: activer_ejabberd
type: string
description: No change
hidden: true
diff --git a/tests/dictionaries/60extra_leadership_valid_enum/yml/extra_dirs/extra/00-base.yml b/tests/dictionaries/60extra_leadership_valid_enum/yml/extra_dirs/extra/00-base.yml
index ccd1baf6b..de8ca9911 100644
--- a/tests/dictionaries/60extra_leadership_valid_enum/yml/extra_dirs/extra/00-base.yml
+++ b/tests/dictionaries/60extra_leadership_valid_enum/yml/extra_dirs/extra/00-base.yml
@@ -1,21 +1,20 @@
version: '0.10'
variables:
- family:
- name: ejabberd
+ - name: ejabberd
variables:
- family:
- name: description
+ - name: description
description: description
leadership: true
variables:
- variable:
- name: description
+ - name: description
type: string
multi: true
value:
- text: test
- - variable:
- name: mode
+ - name: mode
type: choice
choice:
- text: pre
diff --git a/tests/dictionaries/60extra_load/yml/00-base.yml b/tests/dictionaries/60extra_load/yml/00-base.yml
index 6746f490c..f1fcfb050 100644
--- a/tests/dictionaries/60extra_load/yml/00-base.yml
+++ b/tests/dictionaries/60extra_load/yml/00-base.yml
@@ -1,18 +1,17 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
description: "g\xE9n\xE9ral"
variables:
- variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
type: string
description: No change
hidden: true
value:
- text: non
- - variable:
- name: activer_ejabberd
+ - name: activer_ejabberd
type: string
description: No change
hidden: true
diff --git a/tests/dictionaries/60extra_load/yml/extra_dirs/extra/00-base.yml b/tests/dictionaries/60extra_load/yml/extra_dirs/extra/00-base.yml
index 309fa3132..2a9471564 100644
--- a/tests/dictionaries/60extra_load/yml/extra_dirs/extra/00-base.yml
+++ b/tests/dictionaries/60extra_load/yml/extra_dirs/extra/00-base.yml
@@ -1,15 +1,14 @@
version: '0.10'
variables:
- family:
- name: ejabberd
+ - name: ejabberd
variables:
- variable:
- name: description
+ - name: description
type: string
value:
- text: Exportation de la base de ejabberd
- - variable:
- name: day
+ - name: day
type: choice
mandatory: true
choice:
@@ -19,8 +18,7 @@ variables:
- text: monthly
value:
- text: none
- - variable:
- name: mode
+ - name: mode
type: choice
mandatory: true
value:
diff --git a/tests/dictionaries/60extra_mandatory/yml/00-base.yml b/tests/dictionaries/60extra_mandatory/yml/00-base.yml
index 6746f490c..f1fcfb050 100644
--- a/tests/dictionaries/60extra_mandatory/yml/00-base.yml
+++ b/tests/dictionaries/60extra_mandatory/yml/00-base.yml
@@ -1,18 +1,17 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
description: "g\xE9n\xE9ral"
variables:
- variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
type: string
description: No change
hidden: true
value:
- text: non
- - variable:
- name: activer_ejabberd
+ - name: activer_ejabberd
type: string
description: No change
hidden: true
diff --git a/tests/dictionaries/60extra_mandatory/yml/extra_dirs/extra/00-base.yml b/tests/dictionaries/60extra_mandatory/yml/extra_dirs/extra/00-base.yml
index ef06703a7..6684e3f72 100644
--- a/tests/dictionaries/60extra_mandatory/yml/extra_dirs/extra/00-base.yml
+++ b/tests/dictionaries/60extra_mandatory/yml/extra_dirs/extra/00-base.yml
@@ -1,15 +1,14 @@
version: '0.10'
variables:
- family:
- name: ejabberd
+ - name: ejabberd
variables:
- variable:
- name: description
+ - name: description
type: string
value:
- text: Exportation de la base de ejabberd
- - variable:
- name: day
+ - name: day
type: choice
mandatory: true
choice:
@@ -19,8 +18,7 @@ variables:
- text: monthly
value:
- text: none
- - variable:
- name: mode
+ - name: mode
type: choice
mandatory: true
choice:
@@ -28,8 +26,7 @@ variables:
- text: post
value:
- text: pre
- - variable:
- name: var1
+ - name: var1
type: string
mandatory: true
constraints:
diff --git a/tests/dictionaries/60extra_name_family/yml/00-base.yml b/tests/dictionaries/60extra_name_family/yml/00-base.yml
index b31327012..9845e4b57 100644
--- a/tests/dictionaries/60extra_name_family/yml/00-base.yml
+++ b/tests/dictionaries/60extra_name_family/yml/00-base.yml
@@ -1,17 +1,16 @@
version: '0.10'
variables:
- family:
- name: extra
+ - name: extra
variables:
- variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
type: string
description: No change
hidden: true
value:
- text: non
- - variable:
- name: activer_ejabberd
+ - name: activer_ejabberd
type: string
description: No change
hidden: true
diff --git a/tests/dictionaries/60extra_name_family/yml/extra_dirs/extra/00-base.yml b/tests/dictionaries/60extra_name_family/yml/extra_dirs/extra/00-base.yml
index 309fa3132..2a9471564 100644
--- a/tests/dictionaries/60extra_name_family/yml/extra_dirs/extra/00-base.yml
+++ b/tests/dictionaries/60extra_name_family/yml/extra_dirs/extra/00-base.yml
@@ -1,15 +1,14 @@
version: '0.10'
variables:
- family:
- name: ejabberd
+ - name: ejabberd
variables:
- variable:
- name: description
+ - name: description
type: string
value:
- text: Exportation de la base de ejabberd
- - variable:
- name: day
+ - name: day
type: choice
mandatory: true
choice:
@@ -19,8 +18,7 @@ variables:
- text: monthly
value:
- text: none
- - variable:
- name: mode
+ - name: mode
type: choice
mandatory: true
value:
diff --git a/tests/dictionaries/60extra_no_condition/yml/00-base.yml b/tests/dictionaries/60extra_no_condition/yml/00-base.yml
index 935ccec7e..b2c84faae 100644
--- a/tests/dictionaries/60extra_no_condition/yml/00-base.yml
+++ b/tests/dictionaries/60extra_no_condition/yml/00-base.yml
@@ -1,24 +1,22 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
description: "g\xE9n\xE9ral"
variables:
- variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
type: string
description: No change
value:
- text: non
- - variable:
- name: activer_ejabberd
+ - name: activer_ejabberd
type: string
description: No change
hidden: true
value:
- text: non
- - variable:
- name: module_instancie
+ - name: module_instancie
type: string
description: No change
hidden: true
diff --git a/tests/dictionaries/60extra_no_condition/yml/extra_dirs/extra/00-base.yml b/tests/dictionaries/60extra_no_condition/yml/extra_dirs/extra/00-base.yml
index 61462b062..6722541d2 100644
--- a/tests/dictionaries/60extra_no_condition/yml/extra_dirs/extra/00-base.yml
+++ b/tests/dictionaries/60extra_no_condition/yml/extra_dirs/extra/00-base.yml
@@ -1,15 +1,14 @@
version: '0.10'
variables:
- family:
- name: ejabberd
+ - name: ejabberd
variables:
- variable:
- name: description
+ - name: description
type: string
value:
- text: Exportation de la base de ejabberd
- - variable:
- name: day
+ - name: day
type: choice
mandatory: true
choice:
@@ -19,8 +18,7 @@ variables:
- text: monthly
value:
- text: none
- - variable:
- name: mode
+ - name: mode
type: choice
mandatory: true
value:
diff --git a/tests/dictionaries/60extra_redefine/yml/00-base.yml b/tests/dictionaries/60extra_redefine/yml/00-base.yml
index 6746f490c..f1fcfb050 100644
--- a/tests/dictionaries/60extra_redefine/yml/00-base.yml
+++ b/tests/dictionaries/60extra_redefine/yml/00-base.yml
@@ -1,18 +1,17 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
description: "g\xE9n\xE9ral"
variables:
- variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
type: string
description: No change
hidden: true
value:
- text: non
- - variable:
- name: activer_ejabberd
+ - name: activer_ejabberd
type: string
description: No change
hidden: true
diff --git a/tests/dictionaries/60extra_redefine/yml/extra_dirs/extra/00-base.yml b/tests/dictionaries/60extra_redefine/yml/extra_dirs/extra/00-base.yml
index 309fa3132..2a9471564 100644
--- a/tests/dictionaries/60extra_redefine/yml/extra_dirs/extra/00-base.yml
+++ b/tests/dictionaries/60extra_redefine/yml/extra_dirs/extra/00-base.yml
@@ -1,15 +1,14 @@
version: '0.10'
variables:
- family:
- name: ejabberd
+ - name: ejabberd
variables:
- variable:
- name: description
+ - name: description
type: string
value:
- text: Exportation de la base de ejabberd
- - variable:
- name: day
+ - name: day
type: choice
mandatory: true
choice:
@@ -19,8 +18,7 @@ variables:
- text: monthly
value:
- text: none
- - variable:
- name: mode
+ - name: mode
type: choice
mandatory: true
value:
diff --git a/tests/dictionaries/60extra_redefine/yml/extra_dirs/extra/01-redefine.yml b/tests/dictionaries/60extra_redefine/yml/extra_dirs/extra/01-redefine.yml
index 49cf1363c..17a3f2b4f 100644
--- a/tests/dictionaries/60extra_redefine/yml/extra_dirs/extra/01-redefine.yml
+++ b/tests/dictionaries/60extra_redefine/yml/extra_dirs/extra/01-redefine.yml
@@ -1,9 +1,9 @@
version: '0.10'
variables:
- family:
- name: ejabberd
+ - name: ejabberd
variables:
- variable:
- name: description
+ - name: description
redefine: true
hidden: true
diff --git a/tests/dictionaries/60extra_variable_name_extra/yml/00-base.yml b/tests/dictionaries/60extra_variable_name_extra/yml/00-base.yml
index 6746f490c..f1fcfb050 100644
--- a/tests/dictionaries/60extra_variable_name_extra/yml/00-base.yml
+++ b/tests/dictionaries/60extra_variable_name_extra/yml/00-base.yml
@@ -1,18 +1,17 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
description: "g\xE9n\xE9ral"
variables:
- variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
type: string
description: No change
hidden: true
value:
- text: non
- - variable:
- name: activer_ejabberd
+ - name: activer_ejabberd
type: string
description: No change
hidden: true
diff --git a/tests/dictionaries/60extra_variable_name_extra/yml/extra_dirs/extra/00-base.yml b/tests/dictionaries/60extra_variable_name_extra/yml/extra_dirs/extra/00-base.yml
index 7bfc8eb5a..b55833699 100644
--- a/tests/dictionaries/60extra_variable_name_extra/yml/extra_dirs/extra/00-base.yml
+++ b/tests/dictionaries/60extra_variable_name_extra/yml/extra_dirs/extra/00-base.yml
@@ -1,4 +1,4 @@
version: '0.10'
variables:
- variable:
- name: extra
+ - name: extra
diff --git a/tests/dictionaries/60familyaction/yml/00-base.yml b/tests/dictionaries/60familyaction/yml/00-base.yml
index 9b4819ab1..862ba9941 100644
--- a/tests/dictionaries/60familyaction/yml/00-base.yml
+++ b/tests/dictionaries/60familyaction/yml/00-base.yml
@@ -1,11 +1,11 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
description: "g\xE9n\xE9ral"
variables:
- variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
type: string
description: No change
hidden: true
diff --git a/tests/dictionaries/60familyaction/yml/extra_dirs/extra/00-base.yml b/tests/dictionaries/60familyaction/yml/extra_dirs/extra/00-base.yml
index 8b854298f..e28f2266e 100644
--- a/tests/dictionaries/60familyaction/yml/extra_dirs/extra/00-base.yml
+++ b/tests/dictionaries/60familyaction/yml/extra_dirs/extra/00-base.yml
@@ -1,10 +1,10 @@
version: '0.10'
variables:
- family:
- name: test
+ - name: test
variables:
- variable:
- name: delay
+ - name: delay
type: number
description: "d\xE9lai en minutes avant lancement"
value:
diff --git a/tests/dictionaries/60familyaction_mandatory/yml/00-base.yml b/tests/dictionaries/60familyaction_mandatory/yml/00-base.yml
index 9b4819ab1..862ba9941 100644
--- a/tests/dictionaries/60familyaction_mandatory/yml/00-base.yml
+++ b/tests/dictionaries/60familyaction_mandatory/yml/00-base.yml
@@ -1,11 +1,11 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
description: "g\xE9n\xE9ral"
variables:
- variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
type: string
description: No change
hidden: true
diff --git a/tests/dictionaries/60familyaction_mandatory/yml/extra_dirs/extra/00-base.yml b/tests/dictionaries/60familyaction_mandatory/yml/extra_dirs/extra/00-base.yml
index 72c618f11..8acaf2f4b 100644
--- a/tests/dictionaries/60familyaction_mandatory/yml/extra_dirs/extra/00-base.yml
+++ b/tests/dictionaries/60familyaction_mandatory/yml/extra_dirs/extra/00-base.yml
@@ -1,16 +1,15 @@
version: '0.10'
variables:
- family:
- name: test
+ - name: test
variables:
- variable:
- name: delay
+ - name: delay
type: number
description: "d\xE9lai en minutes avant lancement"
value:
- text: 0
- - variable:
- name: day
+ - name: day
type: number
description: day avant lancement
mandatory: true
diff --git a/tests/dictionaries/61extra_auto_freeze/yml/00-base.yml b/tests/dictionaries/61extra_auto_freeze/yml/00-base.yml
index 556841f0f..a93441ff6 100644
--- a/tests/dictionaries/61extra_auto_freeze/yml/00-base.yml
+++ b/tests/dictionaries/61extra_auto_freeze/yml/00-base.yml
@@ -1,15 +1,14 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
description: "g\xE9n\xE9ral"
variables:
- variable:
- name: server_deployed
+ - name: server_deployed
type: boolean
description: No change
- - variable:
- name: activer_ejabberd
+ - name: activer_ejabberd
type: string
description: No change
hidden: true
diff --git a/tests/dictionaries/61extra_auto_freeze/yml/extra_dirs/extra/00-base.yml b/tests/dictionaries/61extra_auto_freeze/yml/extra_dirs/extra/00-base.yml
index 14896072f..475aad268 100644
--- a/tests/dictionaries/61extra_auto_freeze/yml/extra_dirs/extra/00-base.yml
+++ b/tests/dictionaries/61extra_auto_freeze/yml/extra_dirs/extra/00-base.yml
@@ -1,10 +1,10 @@
version: '0.10'
variables:
- family:
- name: ejabberd
+ - name: ejabberd
variables:
- variable:
- name: mode
+ - name: mode
type: string
auto_freeze: true
value:
diff --git a/tests/dictionaries/61extra_dyn/yml/00-base.yml b/tests/dictionaries/61extra_dyn/yml/00-base.yml
index 459344fae..503e4928f 100644
--- a/tests/dictionaries/61extra_dyn/yml/00-base.yml
+++ b/tests/dictionaries/61extra_dyn/yml/00-base.yml
@@ -1,11 +1,11 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
description: "g\xE9n\xE9ral"
variables:
- variable:
- name: varname
+ - name: varname
type: string
description: No change
multi: true
diff --git a/tests/dictionaries/61extra_dyn/yml/extra_dirs/extra/00-base.yml b/tests/dictionaries/61extra_dyn/yml/extra_dirs/extra/00-base.yml
index d453a1f45..867c35c4d 100644
--- a/tests/dictionaries/61extra_dyn/yml/extra_dirs/extra/00-base.yml
+++ b/tests/dictionaries/61extra_dyn/yml/extra_dirs/extra/00-base.yml
@@ -1,9 +1,9 @@
version: '0.10'
variables:
- family:
- name: ejabberd
+ - name: ejabberd
dynamic: varname
variables:
- variable:
- name: mode
+ - name: mode
type: string
diff --git a/tests/dictionaries/61extra_dyn_extra/yml/00-base.yml b/tests/dictionaries/61extra_dyn_extra/yml/00-base.yml
index 459344fae..503e4928f 100644
--- a/tests/dictionaries/61extra_dyn_extra/yml/00-base.yml
+++ b/tests/dictionaries/61extra_dyn_extra/yml/00-base.yml
@@ -1,11 +1,11 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
description: "g\xE9n\xE9ral"
variables:
- variable:
- name: varname
+ - name: varname
type: string
description: No change
multi: true
diff --git a/tests/dictionaries/61extra_dyn_extra/yml/extra_dirs/extra/00-base.yml b/tests/dictionaries/61extra_dyn_extra/yml/extra_dirs/extra/00-base.yml
index 89bdc629c..5142fd74c 100644
--- a/tests/dictionaries/61extra_dyn_extra/yml/extra_dirs/extra/00-base.yml
+++ b/tests/dictionaries/61extra_dyn_extra/yml/extra_dirs/extra/00-base.yml
@@ -1,20 +1,19 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
description: "g\xE9n\xE9ral"
variables:
- variable:
- name: varname
+ - name: varname
type: string
description: No change
multi: true
value:
- text: a
-- family:
- name: ejabberd
+ - name: ejabberd
dynamic: extra.general.varname
variables:
- variable:
- name: mode
+ - name: mode
type: string
diff --git a/tests/dictionaries/70container_files/yml/00-base.yml b/tests/dictionaries/70container_files/yml/00-base.yml
index b2b36a46e..8fb83524c 100644
--- a/tests/dictionaries/70container_files/yml/00-base.yml
+++ b/tests/dictionaries/70container_files/yml/00-base.yml
@@ -7,11 +7,11 @@ services:
- text: /rougail.conf
variables:
- family:
- name: general
+ - name: general
description: "g\xE9n\xE9ral"
variables:
- variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
type: string
description: No change
hidden: true
diff --git a/tests/dictionaries/70container_files_symlink_multi/tiramisu/base.py b/tests/dictionaries/70container_files_symlink_multi/tiramisu/base.py
index 0734b281a..b87feeab7 100644
--- a/tests/dictionaries/70container_files_symlink_multi/tiramisu/base.py
+++ b/tests/dictionaries/70container_files_symlink_multi/tiramisu/base.py
@@ -28,7 +28,7 @@ optiondescription_5.impl_set_information('source', "mailname")
option_10 = SymLinkOption(name="name", opt=option_2)
option_9 = BoolOption(name="activate", doc="activate", default=True)
optiondescription_8 = OptionDescription(name="mailname2", doc="mailname2", children=[option_10, option_9])
-optiondescription_8.impl_set_information('engine', "jinja2")
+optiondescription_8.impl_set_information('engine', "jinja")
optiondescription_8.impl_set_information('source', "mailname2")
optiondescription_4 = OptionDescription(name="files", doc="files", children=[optiondescription_5, optiondescription_8])
option_3 = BoolOption(name="activate", doc="activate", default=True)
diff --git a/tests/dictionaries/70container_files_symlink_multi/tiramisu/multi.py b/tests/dictionaries/70container_files_symlink_multi/tiramisu/multi.py
index 7c8f248c2..7a401ff4b 100644
--- a/tests/dictionaries/70container_files_symlink_multi/tiramisu/multi.py
+++ b/tests/dictionaries/70container_files_symlink_multi/tiramisu/multi.py
@@ -28,7 +28,7 @@ optiondescription_7.impl_set_information('source', "mailname")
option_12 = SymLinkOption(name="name", opt=option_2)
option_11 = BoolOption(name="activate", doc="activate", default=True)
optiondescription_10 = OptionDescription(name="mailname2", doc="mailname2", children=[option_12, option_11])
-optiondescription_10.impl_set_information('engine', "jinja2")
+optiondescription_10.impl_set_information('engine', "jinja")
optiondescription_10.impl_set_information('source', "mailname2")
optiondescription_6 = OptionDescription(name="files", doc="files", children=[optiondescription_7, optiondescription_10])
option_5 = BoolOption(name="activate", doc="activate", default=True)
@@ -47,7 +47,7 @@ optiondescription_16.impl_set_information('source', "mailname")
option_21 = SymLinkOption(name="name", opt=option_4)
option_20 = BoolOption(name="activate", doc="activate", default=True)
optiondescription_19 = OptionDescription(name="mailname2", doc="mailname2", children=[option_21, option_20])
-optiondescription_19.impl_set_information('engine', "jinja2")
+optiondescription_19.impl_set_information('engine', "jinja")
optiondescription_19.impl_set_information('source', "mailname2")
optiondescription_15 = OptionDescription(name="files", doc="files", children=[optiondescription_16, optiondescription_19])
option_14 = BoolOption(name="activate", doc="activate", default=True)
diff --git a/tests/dictionaries/70container_files_symlink_multi/xml/00-base.xml b/tests/dictionaries/70container_files_symlink_multi/xml/00-base.xml
index 3f3e683f0..6dbae4d76 100644
--- a/tests/dictionaries/70container_files_symlink_multi/xml/00-base.xml
+++ b/tests/dictionaries/70container_files_symlink_multi/xml/00-base.xml
@@ -3,7 +3,7 @@
file_name
- file_name2
+ file_name2
diff --git a/tests/dictionaries/70container_files_symlink_multi/yml/00-base.yml b/tests/dictionaries/70container_files_symlink_multi/yml/00-base.yml
index ad41fa710..5c47924f8 100644
--- a/tests/dictionaries/70container_files_symlink_multi/yml/00-base.yml
+++ b/tests/dictionaries/70container_files_symlink_multi/yml/00-base.yml
@@ -8,18 +8,17 @@ services:
text: file_name
- file_type: variable
source: mailname2
- engine: jinja2
+ engine: jinja
text: file_name2
variables:
- variable:
- name: file_name
+ - name: file_name
type: filename
multi: true
value:
- text: /etc/mailname
- text: /etc/mailname2
-- variable:
- name: file_name2
+ - name: file_name2
type: filename
multi: true
value:
diff --git a/tests/dictionaries/70container_files_symlink_multi_variable/tiramisu/base.py b/tests/dictionaries/70container_files_symlink_multi_variable/tiramisu/base.py
index 99bae373b..7bdbf9e98 100644
--- a/tests/dictionaries/70container_files_symlink_multi_variable/tiramisu/base.py
+++ b/tests/dictionaries/70container_files_symlink_multi_variable/tiramisu/base.py
@@ -31,7 +31,7 @@ option_12 = SymLinkOption(name="name", opt=option_2)
option_13 = SymLinkOption(name="variable", opt=option_3)
option_11 = BoolOption(name="activate", doc="activate", default=True)
optiondescription_10 = OptionDescription(name="mailname2", doc="mailname2", children=[option_12, option_13, option_11])
-optiondescription_10.impl_set_information('engine', "jinja2")
+optiondescription_10.impl_set_information('engine', "jinja")
optiondescription_10.impl_set_information('source', "mailname2")
optiondescription_5 = OptionDescription(name="files", doc="files", children=[optiondescription_6, optiondescription_10])
option_4 = BoolOption(name="activate", doc="activate", default=True)
diff --git a/tests/dictionaries/70container_files_symlink_multi_variable/tiramisu/multi.py b/tests/dictionaries/70container_files_symlink_multi_variable/tiramisu/multi.py
index e91abfd45..6c1ce23c8 100644
--- a/tests/dictionaries/70container_files_symlink_multi_variable/tiramisu/multi.py
+++ b/tests/dictionaries/70container_files_symlink_multi_variable/tiramisu/multi.py
@@ -31,7 +31,7 @@ option_15 = SymLinkOption(name="name", opt=option_2)
option_16 = SymLinkOption(name="variable", opt=option_3)
option_14 = BoolOption(name="activate", doc="activate", default=True)
optiondescription_13 = OptionDescription(name="mailname2", doc="mailname2", children=[option_15, option_16, option_14])
-optiondescription_13.impl_set_information('engine', "jinja2")
+optiondescription_13.impl_set_information('engine', "jinja")
optiondescription_13.impl_set_information('source', "mailname2")
optiondescription_8 = OptionDescription(name="files", doc="files", children=[optiondescription_9, optiondescription_13])
option_7 = BoolOption(name="activate", doc="activate", default=True)
@@ -53,7 +53,7 @@ option_26 = SymLinkOption(name="name", opt=option_5)
option_27 = SymLinkOption(name="variable", opt=option_6)
option_25 = BoolOption(name="activate", doc="activate", default=True)
optiondescription_24 = OptionDescription(name="mailname2", doc="mailname2", children=[option_26, option_27, option_25])
-optiondescription_24.impl_set_information('engine', "jinja2")
+optiondescription_24.impl_set_information('engine', "jinja")
optiondescription_24.impl_set_information('source', "mailname2")
optiondescription_19 = OptionDescription(name="files", doc="files", children=[optiondescription_20, optiondescription_24])
option_18 = BoolOption(name="activate", doc="activate", default=True)
diff --git a/tests/dictionaries/70container_files_symlink_multi_variable/xml/00-base.xml b/tests/dictionaries/70container_files_symlink_multi_variable/xml/00-base.xml
index c8dd10dee..38e035a79 100644
--- a/tests/dictionaries/70container_files_symlink_multi_variable/xml/00-base.xml
+++ b/tests/dictionaries/70container_files_symlink_multi_variable/xml/00-base.xml
@@ -3,7 +3,7 @@
file_name
- file_name2
+ file_name2
diff --git a/tests/dictionaries/70container_files_symlink_multi_variable/yml/00-base.yml b/tests/dictionaries/70container_files_symlink_multi_variable/yml/00-base.yml
index a630e4ac0..51c1abcec 100644
--- a/tests/dictionaries/70container_files_symlink_multi_variable/yml/00-base.yml
+++ b/tests/dictionaries/70container_files_symlink_multi_variable/yml/00-base.yml
@@ -10,25 +10,23 @@ services:
- file_type: variable
source: mailname2
variable: var
- engine: jinja2
+ engine: jinja
text: file_name2
variables:
- variable:
- name: file_name
+ - name: file_name
type: filename
multi: true
value:
- text: /etc/mailname
- text: /etc/mailname2
-- variable:
- name: file_name2
+ - name: file_name2
type: filename
multi: true
value:
- text: /etc/mailname3
- text: /etc/mailname4
-- variable:
- name: var
+ - name: var
type: string
multi: true
value:
diff --git a/tests/dictionaries/70container_files_symlink_variable/yml/00-base.yml b/tests/dictionaries/70container_files_symlink_variable/yml/00-base.yml
index 1434e6e70..f9b2af302 100644
--- a/tests/dictionaries/70container_files_symlink_variable/yml/00-base.yml
+++ b/tests/dictionaries/70container_files_symlink_variable/yml/00-base.yml
@@ -9,12 +9,11 @@ services:
text: file_name
variables:
- variable:
- name: file_name
+ - name: file_name
type: filename
value:
- text: /etc/mailname
-- variable:
- name: var
+ - name: var
type: string
value:
- text: mailname
diff --git a/tests/dictionaries/70container_files_twice/yml/00-base.yml b/tests/dictionaries/70container_files_twice/yml/00-base.yml
index 42f7b4214..7e4257753 100644
--- a/tests/dictionaries/70container_files_twice/yml/00-base.yml
+++ b/tests/dictionaries/70container_files_twice/yml/00-base.yml
@@ -8,11 +8,11 @@ services:
- text: /rougail.conf
variables:
- family:
- name: general
+ - name: general
description: "g\xE9n\xE9ral"
variables:
- variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
type: string
description: No change
hidden: true
diff --git a/tests/dictionaries/70container_filesmulti/yml/00-base.yml b/tests/dictionaries/70container_filesmulti/yml/00-base.yml
index 5b8d16178..de2504bff 100644
--- a/tests/dictionaries/70container_filesmulti/yml/00-base.yml
+++ b/tests/dictionaries/70container_filesmulti/yml/00-base.yml
@@ -7,11 +7,11 @@ services:
- text: /etc/mailname2
variables:
- family:
- name: general
+ - name: general
description: "g\xE9n\xE9ral"
variables:
- variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
type: string
description: No change
hidden: true
diff --git a/tests/dictionaries/70container_filesredefine/yml/00-base.yml b/tests/dictionaries/70container_filesredefine/yml/00-base.yml
index e6ea2ed5f..663493d49 100644
--- a/tests/dictionaries/70container_filesredefine/yml/00-base.yml
+++ b/tests/dictionaries/70container_filesredefine/yml/00-base.yml
@@ -6,11 +6,11 @@ services:
- text: /etc/mailname
variables:
- family:
- name: general
+ - name: general
description: "g\xE9n\xE9ral"
variables:
- variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
type: string
description: No change
hidden: true
diff --git a/tests/dictionaries/70container_new/yml/00-base.yml b/tests/dictionaries/70container_new/yml/00-base.yml
index eea1980b9..4b85f2e4f 100644
--- a/tests/dictionaries/70container_new/yml/00-base.yml
+++ b/tests/dictionaries/70container_new/yml/00-base.yml
@@ -4,11 +4,11 @@ services:
- name: test
variables:
- family:
- name: general
+ - name: general
description: "g\xE9n\xE9ral"
variables:
- variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
type: string
description: No change
hidden: true
diff --git a/tests/dictionaries/70container_newnocont/yml/00-base.yml b/tests/dictionaries/70container_newnocont/yml/00-base.yml
index 61b47dc64..ff61f64f0 100644
--- a/tests/dictionaries/70container_newnocont/yml/00-base.yml
+++ b/tests/dictionaries/70container_newnocont/yml/00-base.yml
@@ -4,11 +4,11 @@ services:
- name: test
variables:
- family:
- name: general
+ - name: general
description: "g\xE9n\xE9ral"
variables:
- variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
type: string
description: No change
hidden: true
diff --git a/tests/dictionaries/70container_newwithip/yml/00-base.yml b/tests/dictionaries/70container_newwithip/yml/00-base.yml
index 69885c3f0..44c8ad5ba 100644
--- a/tests/dictionaries/70container_newwithip/yml/00-base.yml
+++ b/tests/dictionaries/70container_newwithip/yml/00-base.yml
@@ -4,17 +4,16 @@ services:
- name: test
variables:
- family:
- name: general
+ - name: general
description: "g\xE9n\xE9ral"
variables:
- variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
type: string
description: No change
hidden: true
value:
- text: oui
- - variable:
- name: adresse_ip_test
+ - name: adresse_ip_test
type: ip
description: No change
diff --git a/tests/dictionaries/70container_save/yml/00-base.yml b/tests/dictionaries/70container_save/yml/00-base.yml
index 6a6e0a436..73c5d512b 100644
--- a/tests/dictionaries/70container_save/yml/00-base.yml
+++ b/tests/dictionaries/70container_save/yml/00-base.yml
@@ -1,11 +1,11 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
description: "g\xE9n\xE9ral"
variables:
- variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
type: string
description: No change
hidden: true
diff --git a/tests/dictionaries/70service_base/yml/00-base.yml b/tests/dictionaries/70service_base/yml/00-base.yml
index 17212a37c..35f65adb5 100644
--- a/tests/dictionaries/70service_base/yml/00-base.yml
+++ b/tests/dictionaries/70service_base/yml/00-base.yml
@@ -4,11 +4,11 @@ services:
- name: testsrv
variables:
- family:
- name: general
+ - name: general
description: "g\xE9n\xE9ral"
variables:
- variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
type: string
description: No change
hidden: true
diff --git a/tests/dictionaries/70service_disabled/yml/00-base.yml b/tests/dictionaries/70service_disabled/yml/00-base.yml
index 37e18f57b..847538f8f 100644
--- a/tests/dictionaries/70service_disabled/yml/00-base.yml
+++ b/tests/dictionaries/70service_disabled/yml/00-base.yml
@@ -5,6 +5,6 @@ services:
disabled: true
variables:
- variable:
- name: condition
+ - name: condition
value:
- text: 'no'
diff --git a/tests/dictionaries/70service_disabled_undisable/yml/00-base.yml b/tests/dictionaries/70service_disabled_undisable/yml/00-base.yml
index 8c4648e74..b014c6e58 100644
--- a/tests/dictionaries/70service_disabled_undisable/yml/00-base.yml
+++ b/tests/dictionaries/70service_disabled_undisable/yml/00-base.yml
@@ -6,6 +6,6 @@ services:
undisable: true
variables:
- variable:
- name: condition
+ - name: condition
value:
- text: 'no'
diff --git a/tests/dictionaries/70service_engine/yml/00-base.yml b/tests/dictionaries/70service_engine/yml/00-base.yml
index 15656aac6..df31195af 100644
--- a/tests/dictionaries/70service_engine/yml/00-base.yml
+++ b/tests/dictionaries/70service_engine/yml/00-base.yml
@@ -5,11 +5,11 @@ services:
engine: creole
variables:
- family:
- name: general
+ - name: general
description: "g\xE9n\xE9ral"
variables:
- variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
type: string
description: No change
hidden: true
diff --git a/tests/dictionaries/70service_engine_dash/yml/00-base.yml b/tests/dictionaries/70service_engine_dash/yml/00-base.yml
index 626a916e8..0679b5989 100644
--- a/tests/dictionaries/70service_engine_dash/yml/00-base.yml
+++ b/tests/dictionaries/70service_engine_dash/yml/00-base.yml
@@ -5,11 +5,11 @@ services:
engine: creole
variables:
- family:
- name: general
+ - name: general
description: "g\xE9n\xE9ral"
variables:
- variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
type: string
description: No change
hidden: true
diff --git a/tests/dictionaries/70service_mount/yml/00-base.yml b/tests/dictionaries/70service_mount/yml/00-base.yml
index a332ac3f1..6ce8d6d12 100644
--- a/tests/dictionaries/70service_mount/yml/00-base.yml
+++ b/tests/dictionaries/70service_mount/yml/00-base.yml
@@ -6,11 +6,11 @@ services:
engine: creole
variables:
- family:
- name: general
+ - name: general
description: "g\xE9n\xE9ral"
variables:
- variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
type: string
description: No change
hidden: true
diff --git a/tests/dictionaries/70service_not_managed/yml/00-base.yml b/tests/dictionaries/70service_not_managed/yml/00-base.yml
index 93ff1ed7e..c4f2814d7 100644
--- a/tests/dictionaries/70service_not_managed/yml/00-base.yml
+++ b/tests/dictionaries/70service_not_managed/yml/00-base.yml
@@ -7,7 +7,7 @@ services:
- text: /tmp/test
variables:
- variable:
- name: var
+ - name: var
type: string
value:
- text: mailname
diff --git a/tests/dictionaries/70service_servicelist/yml/00-base.yml b/tests/dictionaries/70service_servicelist/yml/00-base.yml
index 863e128a7..27d44e054 100644
--- a/tests/dictionaries/70service_servicelist/yml/00-base.yml
+++ b/tests/dictionaries/70service_servicelist/yml/00-base.yml
@@ -5,7 +5,7 @@ services:
servicelist: test
variables:
- variable:
- name: condition
+ - name: condition
value:
- text: 'no'
constraints:
diff --git a/tests/dictionaries/70service_servicelist_disabled_if_in/yml/00-base.yml b/tests/dictionaries/70service_servicelist_disabled_if_in/yml/00-base.yml
index 6221e2fba..41725486c 100644
--- a/tests/dictionaries/70service_servicelist_disabled_if_in/yml/00-base.yml
+++ b/tests/dictionaries/70service_servicelist_disabled_if_in/yml/00-base.yml
@@ -5,11 +5,10 @@ services:
servicelist: test
variables:
- variable:
- name: condition1
+ - name: condition1
value:
- text: 'no'
-- variable:
- name: condition2
+ - name: condition2
value:
- text: 'no'
constraints:
diff --git a/tests/dictionaries/70service_servicelist_extra/yml/extra_dirs/extra/00-base.yml b/tests/dictionaries/70service_servicelist_extra/yml/extra_dirs/extra/00-base.yml
index 5747d3ad1..e47310b29 100644
--- a/tests/dictionaries/70service_servicelist_extra/yml/extra_dirs/extra/00-base.yml
+++ b/tests/dictionaries/70service_servicelist_extra/yml/extra_dirs/extra/00-base.yml
@@ -1,7 +1,7 @@
version: '0.10'
variables:
- variable:
- name: condition
+ - name: condition
value:
- text: 'no'
constraints:
diff --git a/tests/dictionaries/70service_servicelist_file/yml/00-base.yml b/tests/dictionaries/70service_servicelist_file/yml/00-base.yml
index a2298623b..cb1e6b312 100644
--- a/tests/dictionaries/70service_servicelist_file/yml/00-base.yml
+++ b/tests/dictionaries/70service_servicelist_file/yml/00-base.yml
@@ -7,11 +7,10 @@ services:
- text: /etc/file
variables:
- variable:
- name: condition
+ - name: condition
value:
- text: 'no'
-- variable:
- name: nut_monitor_host
+ - name: nut_monitor_host
type: ip
mandatory: true
value:
diff --git a/tests/dictionaries/70service_servicelist_ip/yml/00-base.yml b/tests/dictionaries/70service_servicelist_ip/yml/00-base.yml
index be703a515..e45f5ffd7 100644
--- a/tests/dictionaries/70service_servicelist_ip/yml/00-base.yml
+++ b/tests/dictionaries/70service_servicelist_ip/yml/00-base.yml
@@ -7,11 +7,10 @@ services:
- text: nut_monitor_host
variables:
- variable:
- name: condition
+ - name: condition
value:
- text: 'no'
-- variable:
- name: nut_monitor_host
+ - name: nut_monitor_host
type: ip
mandatory: true
value:
diff --git a/tests/dictionaries/70service_servicelist_not_managed/yml/00-base.yml b/tests/dictionaries/70service_servicelist_not_managed/yml/00-base.yml
index dc9d81e92..f553f60de 100644
--- a/tests/dictionaries/70service_servicelist_not_managed/yml/00-base.yml
+++ b/tests/dictionaries/70service_servicelist_not_managed/yml/00-base.yml
@@ -6,7 +6,7 @@ services:
manage: false
variables:
- variable:
- name: condition
+ - name: condition
value:
- text: 'no'
constraints:
diff --git a/tests/dictionaries/70service_target/yml/00-base.yml b/tests/dictionaries/70service_target/yml/00-base.yml
index b3122e91b..d154e5ea9 100644
--- a/tests/dictionaries/70service_target/yml/00-base.yml
+++ b/tests/dictionaries/70service_target/yml/00-base.yml
@@ -5,11 +5,11 @@ services:
target: test
variables:
- family:
- name: general
+ - name: general
description: "g\xE9n\xE9ral"
variables:
- variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
type: string
description: No change
hidden: true
diff --git a/tests/dictionaries/70service_target_engine/yml/00-base.yml b/tests/dictionaries/70service_target_engine/yml/00-base.yml
index f968d4dfb..34fedee22 100644
--- a/tests/dictionaries/70service_target_engine/yml/00-base.yml
+++ b/tests/dictionaries/70service_target_engine/yml/00-base.yml
@@ -6,11 +6,11 @@ services:
engine: none
variables:
- family:
- name: general
+ - name: general
description: "g\xE9n\xE9ral"
variables:
- variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
type: string
description: No change
hidden: true
diff --git a/tests/dictionaries/70services_ip/yml/00-base.yml b/tests/dictionaries/70services_ip/yml/00-base.yml
index 3e12f9c9c..965ded728 100644
--- a/tests/dictionaries/70services_ip/yml/00-base.yml
+++ b/tests/dictionaries/70services_ip/yml/00-base.yml
@@ -6,7 +6,7 @@ services:
- text: nut_monitor_host
variables:
- variable:
- name: nut_monitor_host
+ - name: nut_monitor_host
type: ip
mandatory: true
value:
diff --git a/tests/dictionaries/70services_ip_cidr/yml/00-base.yml b/tests/dictionaries/70services_ip_cidr/yml/00-base.yml
index 03066646f..8acf794e9 100644
--- a/tests/dictionaries/70services_ip_cidr/yml/00-base.yml
+++ b/tests/dictionaries/70services_ip_cidr/yml/00-base.yml
@@ -6,7 +6,7 @@ services:
- text: nut_monitor_host
variables:
- variable:
- name: nut_monitor_host
+ - name: nut_monitor_host
type: network_cidr
mandatory: true
value:
diff --git a/tests/dictionaries/70services_ip_disabled/yml/00-base.yml b/tests/dictionaries/70services_ip_disabled/yml/00-base.yml
index b6be7b943..01498c6e8 100644
--- a/tests/dictionaries/70services_ip_disabled/yml/00-base.yml
+++ b/tests/dictionaries/70services_ip_disabled/yml/00-base.yml
@@ -6,7 +6,7 @@ services:
- text: nut_monitor_host
variables:
- variable:
- name: nut_monitor_host
+ - name: nut_monitor_host
type: ip
mandatory: true
disabled: true
diff --git a/tests/dictionaries/70services_ip_extra/yml/extra_dirs/extra/00-base.yml b/tests/dictionaries/70services_ip_extra/yml/extra_dirs/extra/00-base.yml
index 82c9057c9..bfe7473ba 100644
--- a/tests/dictionaries/70services_ip_extra/yml/extra_dirs/extra/00-base.yml
+++ b/tests/dictionaries/70services_ip_extra/yml/extra_dirs/extra/00-base.yml
@@ -1,7 +1,7 @@
version: '0.10'
variables:
- variable:
- name: nut_monitor_host
+ - name: nut_monitor_host
type: network_cidr
mandatory: true
value:
diff --git a/tests/dictionaries/70services_ip_iplist/yml/00-base.yml b/tests/dictionaries/70services_ip_iplist/yml/00-base.yml
index eb11ad125..55ea391cb 100644
--- a/tests/dictionaries/70services_ip_iplist/yml/00-base.yml
+++ b/tests/dictionaries/70services_ip_iplist/yml/00-base.yml
@@ -7,11 +7,10 @@ services:
text: nut_monitor_host
variables:
- variable:
- name: condition
+ - name: condition
value:
- text: 'no'
-- variable:
- name: nut_monitor_host
+ - name: nut_monitor_host
type: network_cidr
mandatory: true
value:
diff --git a/tests/dictionaries/70services_ip_iplist2/yml/00-base.yml b/tests/dictionaries/70services_ip_iplist2/yml/00-base.yml
index ceede7f0d..75f4fd96c 100644
--- a/tests/dictionaries/70services_ip_iplist2/yml/00-base.yml
+++ b/tests/dictionaries/70services_ip_iplist2/yml/00-base.yml
@@ -7,11 +7,10 @@ services:
text: nut_monitor_host
variables:
- variable:
- name: condition
+ - name: condition
value:
- text: 'yes'
-- variable:
- name: nut_monitor_host
+ - name: nut_monitor_host
type: network_cidr
mandatory: true
value:
diff --git a/tests/dictionaries/70services_ip_leadership/yml/00-base.yml b/tests/dictionaries/70services_ip_leadership/yml/00-base.yml
index db44e49f6..09e279f59 100644
--- a/tests/dictionaries/70services_ip_leadership/yml/00-base.yml
+++ b/tests/dictionaries/70services_ip_leadership/yml/00-base.yml
@@ -7,23 +7,22 @@ services:
text: nut_monitor_host
variables:
- family:
- name: general
+ - name: general
description: "g\xE9n\xE9ral"
variables:
- family:
- name: nut_monitor_netmask
+ - name: nut_monitor_netmask
description: nut_monitor_netmask
leadership: true
variables:
- variable:
- name: nut_monitor_netmask
+ - name: nut_monitor_netmask
type: netmask
mandatory: true
multi: true
value:
- text: 255.255.255.0
- - variable:
- name: nut_monitor_host
+ - name: nut_monitor_host
type: network
mandatory: true
value:
diff --git a/tests/dictionaries/70services_ip_multi/yml/00-base.yml b/tests/dictionaries/70services_ip_multi/yml/00-base.yml
index 2f9693634..9bf812e28 100644
--- a/tests/dictionaries/70services_ip_multi/yml/00-base.yml
+++ b/tests/dictionaries/70services_ip_multi/yml/00-base.yml
@@ -6,7 +6,7 @@ services:
- text: nut_monitor_host
variables:
- variable:
- name: nut_monitor_host
+ - name: nut_monitor_host
type: ip
mandatory: true
multi: true
diff --git a/tests/dictionaries/70services_ip_network/yml/00-base.yml b/tests/dictionaries/70services_ip_network/yml/00-base.yml
index cfeeb5b8d..e1f1dfcab 100644
--- a/tests/dictionaries/70services_ip_network/yml/00-base.yml
+++ b/tests/dictionaries/70services_ip_network/yml/00-base.yml
@@ -7,13 +7,12 @@ services:
text: nut_monitor_host
variables:
- variable:
- name: nut_monitor_netmask
+ - name: nut_monitor_netmask
type: netmask
mandatory: true
value:
- text: 255.255.255.0
-- variable:
- name: nut_monitor_host
+ - name: nut_monitor_host
type: network
mandatory: true
value:
diff --git a/tests/dictionaries/70services_ip_not_mandatory/yml/00-base.yml b/tests/dictionaries/70services_ip_not_mandatory/yml/00-base.yml
index d77f03088..edb3255a3 100644
--- a/tests/dictionaries/70services_ip_not_mandatory/yml/00-base.yml
+++ b/tests/dictionaries/70services_ip_not_mandatory/yml/00-base.yml
@@ -6,5 +6,5 @@ services:
- text: nut_monitor_host
variables:
- variable:
- name: nut_monitor_host
+ - name: nut_monitor_host
type: ip
diff --git a/tests/dictionaries/70services_ip_twice/yml/00-base.yml b/tests/dictionaries/70services_ip_twice/yml/00-base.yml
index c0f63824e..0cc7fd876 100644
--- a/tests/dictionaries/70services_ip_twice/yml/00-base.yml
+++ b/tests/dictionaries/70services_ip_twice/yml/00-base.yml
@@ -7,13 +7,12 @@ services:
- text: nut_monitor_host2
variables:
- variable:
- name: nut_monitor_host
+ - name: nut_monitor_host
type: ip
mandatory: true
value:
- text: 192.168.0.1
-- variable:
- name: nut_monitor_host2
+ - name: nut_monitor_host2
type: ip
mandatory: true
value:
diff --git a/tests/dictionaries/80auto_family/yml/00-base.yml b/tests/dictionaries/80auto_family/yml/00-base.yml
index ee8932e6d..df26be0bf 100644
--- a/tests/dictionaries/80auto_family/yml/00-base.yml
+++ b/tests/dictionaries/80auto_family/yml/00-base.yml
@@ -1,10 +1,10 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
variables:
- variable:
- name: variable
+ - name: variable
type: string
description: No change
value:
diff --git a/tests/dictionaries/80check_self/yml/00-base.yml b/tests/dictionaries/80check_self/yml/00-base.yml
index 5a3011e39..ff7304b6b 100644
--- a/tests/dictionaries/80check_self/yml/00-base.yml
+++ b/tests/dictionaries/80check_self/yml/00-base.yml
@@ -1,16 +1,15 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
variables:
- variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
type: string
description: No change
value:
- text: b
- - variable:
- name: int
+ - name: int
type: number
description: No change
constraints:
diff --git a/tests/dictionaries/80check_unknown/yml/00-base.yml b/tests/dictionaries/80check_unknown/yml/00-base.yml
index 63958c388..503ff201d 100644
--- a/tests/dictionaries/80check_unknown/yml/00-base.yml
+++ b/tests/dictionaries/80check_unknown/yml/00-base.yml
@@ -1,16 +1,15 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
variables:
- variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
type: string
description: No change
value:
- text: b
- - variable:
- name: int
+ - name: int
type: number
description: No change
constraints:
diff --git a/tests/dictionaries/80check_unknown_var/yml/00-base.yml b/tests/dictionaries/80check_unknown_var/yml/00-base.yml
index 5c8da1151..72e14ae8b 100644
--- a/tests/dictionaries/80check_unknown_var/yml/00-base.yml
+++ b/tests/dictionaries/80check_unknown_var/yml/00-base.yml
@@ -1,10 +1,10 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
variables:
- variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
type: string
description: No change
value:
diff --git a/tests/dictionaries/80check_without_target/yml/00-base.yml b/tests/dictionaries/80check_without_target/yml/00-base.yml
index afca03569..ad8375ca5 100644
--- a/tests/dictionaries/80check_without_target/yml/00-base.yml
+++ b/tests/dictionaries/80check_without_target/yml/00-base.yml
@@ -1,16 +1,15 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
variables:
- variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
type: string
description: No change
value:
- text: b
- - variable:
- name: int
+ - name: int
type: number
description: No change
constraints:
diff --git a/tests/dictionaries/80condition_itself/yml/00-base.yml b/tests/dictionaries/80condition_itself/yml/00-base.yml
index 83c821b77..e8fec5ce5 100644
--- a/tests/dictionaries/80condition_itself/yml/00-base.yml
+++ b/tests/dictionaries/80condition_itself/yml/00-base.yml
@@ -1,10 +1,10 @@
version: '0.10'
variables:
- family:
- name: test
+ - name: test
variables:
- variable:
- name: replicationtype
+ - name: replicationtype
description: replicationType
constraints:
- condition:
diff --git a/tests/dictionaries/80condition_not_exists_error/yml/00-base.yml b/tests/dictionaries/80condition_not_exists_error/yml/00-base.yml
index 3b94311b4..281b472fd 100644
--- a/tests/dictionaries/80condition_not_exists_error/yml/00-base.yml
+++ b/tests/dictionaries/80condition_not_exists_error/yml/00-base.yml
@@ -1,10 +1,10 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
variables:
- variable:
- name: condition
+ - name: condition
type: string
description: No change
value:
diff --git a/tests/dictionaries/80condition_not_exists_error_var/yml/00-base.yml b/tests/dictionaries/80condition_not_exists_error_var/yml/00-base.yml
index d3b5dfcbc..841edd924 100644
--- a/tests/dictionaries/80condition_not_exists_error_var/yml/00-base.yml
+++ b/tests/dictionaries/80condition_not_exists_error_var/yml/00-base.yml
@@ -1,10 +1,10 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
variables:
- variable:
- name: condition
+ - name: condition
type: string
description: No change
value:
diff --git a/tests/dictionaries/80condition_without_target/yml/00-base.yml b/tests/dictionaries/80condition_without_target/yml/00-base.yml
index 428886bd4..a86195061 100644
--- a/tests/dictionaries/80condition_without_target/yml/00-base.yml
+++ b/tests/dictionaries/80condition_without_target/yml/00-base.yml
@@ -1,28 +1,25 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
variables:
- variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
type: string
description: No change
value:
- text: non
- - variable:
- name: condition
+ - name: condition
type: string
description: No change
value:
- text: non
- - variable:
- name: mode_conteneur_actif1
+ - name: mode_conteneur_actif1
type: string
description: No change
value:
- text: non
- - variable:
- name: mode_conteneur_actif2
+ - name: mode_conteneur_actif2
type: string
description: No change
value:
diff --git a/tests/dictionaries/80container_files_symlink_without_source/yml/00-base.yml b/tests/dictionaries/80container_files_symlink_without_source/yml/00-base.yml
index 76a9f4e7f..7ee6c76a4 100644
--- a/tests/dictionaries/80container_files_symlink_without_source/yml/00-base.yml
+++ b/tests/dictionaries/80container_files_symlink_without_source/yml/00-base.yml
@@ -7,18 +7,17 @@ services:
text: file_name
variables:
- family:
- name: general
+ - name: general
description: "g\xE9n\xE9ral"
variables:
- variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
type: string
description: No change
hidden: true
value:
- text: oui
- - variable:
- name: file_name
+ - name: file_name
type: string
value:
- text: /etc/mailname
diff --git a/tests/dictionaries/80container_filesredefine_error/yml/00-base.yml b/tests/dictionaries/80container_filesredefine_error/yml/00-base.yml
index e6ea2ed5f..663493d49 100644
--- a/tests/dictionaries/80container_filesredefine_error/yml/00-base.yml
+++ b/tests/dictionaries/80container_filesredefine_error/yml/00-base.yml
@@ -6,11 +6,11 @@ services:
- text: /etc/mailname
variables:
- family:
- name: general
+ - name: general
description: "g\xE9n\xE9ral"
variables:
- variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
type: string
description: No change
hidden: true
diff --git a/tests/dictionaries/80empty_param_number/yml/00_base.yml b/tests/dictionaries/80empty_param_number/yml/00_base.yml
index 171b7fa70..53d117e21 100644
--- a/tests/dictionaries/80empty_param_number/yml/00_base.yml
+++ b/tests/dictionaries/80empty_param_number/yml/00_base.yml
@@ -1,15 +1,14 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
variables:
- variable:
- name: toto1
+ - name: toto1
type: port
description: "Port d'\xE9coute du proxy"
mode: expert
- - variable:
- name: toto2
+ - name: toto2
type: port
description: "Port d'\xE9coute du proxy NTLM"
mode: expert
diff --git a/tests/dictionaries/80empty_typeeole_eole/yml/00_base.yml b/tests/dictionaries/80empty_typeeole_eole/yml/00_base.yml
index eb0f55224..1d17cf329 100644
--- a/tests/dictionaries/80empty_typeeole_eole/yml/00_base.yml
+++ b/tests/dictionaries/80empty_typeeole_eole/yml/00_base.yml
@@ -1,15 +1,14 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
variables:
- variable:
- name: toto1
+ - name: toto1
type: port
description: "Port d'\xE9coute du proxy"
mode: expert
- - variable:
- name: toto2
+ - name: toto2
type: port
description: "Port d'\xE9coute du proxy NTLM"
mode: expert
diff --git a/tests/dictionaries/80empty_typeeole_number/yml/00_base.yml b/tests/dictionaries/80empty_typeeole_number/yml/00_base.yml
index 8cb176c1e..4473ddcd5 100644
--- a/tests/dictionaries/80empty_typeeole_number/yml/00_base.yml
+++ b/tests/dictionaries/80empty_typeeole_number/yml/00_base.yml
@@ -1,12 +1,11 @@
version: '0.10'
variables:
- variable:
- name: toto1
+ - name: toto1
type: port
description: "Port d'\xE9coute du proxy"
mode: expert
-- variable:
- name: toto2
+ - name: toto2
type: port
description: "Port d'\xE9coute du proxy NTLM"
mode: expert
diff --git a/tests/dictionaries/80extra_externalspaceauto/yml/00-base.yml b/tests/dictionaries/80extra_externalspaceauto/yml/00-base.yml
index 374f4a91f..083ecd813 100644
--- a/tests/dictionaries/80extra_externalspaceauto/yml/00-base.yml
+++ b/tests/dictionaries/80extra_externalspaceauto/yml/00-base.yml
@@ -1,11 +1,11 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
description: "g\xE9n\xE9ral"
variables:
- variable:
- name: activer_ejabberd
+ - name: activer_ejabberd
type: string
description: No change
hidden: true
diff --git a/tests/dictionaries/80extra_externalspaceauto/yml/extra_dirs/extra/00-base.yml b/tests/dictionaries/80extra_externalspaceauto/yml/extra_dirs/extra/00-base.yml
index 61462b062..6722541d2 100644
--- a/tests/dictionaries/80extra_externalspaceauto/yml/extra_dirs/extra/00-base.yml
+++ b/tests/dictionaries/80extra_externalspaceauto/yml/extra_dirs/extra/00-base.yml
@@ -1,15 +1,14 @@
version: '0.10'
variables:
- family:
- name: ejabberd
+ - name: ejabberd
variables:
- variable:
- name: description
+ - name: description
type: string
value:
- text: Exportation de la base de ejabberd
- - variable:
- name: day
+ - name: day
type: choice
mandatory: true
choice:
@@ -19,8 +18,7 @@ variables:
- text: monthly
value:
- text: none
- - variable:
- name: mode
+ - name: mode
type: choice
mandatory: true
value:
diff --git a/tests/dictionaries/80extra_externalspaceauto/yml/extra_dirs/extra1/00-base.yml b/tests/dictionaries/80extra_externalspaceauto/yml/extra_dirs/extra1/00-base.yml
index fd600694f..63eb518cb 100644
--- a/tests/dictionaries/80extra_externalspaceauto/yml/extra_dirs/extra1/00-base.yml
+++ b/tests/dictionaries/80extra_externalspaceauto/yml/extra_dirs/extra1/00-base.yml
@@ -1,10 +1,10 @@
version: '0.10'
variables:
- family:
- name: external
+ - name: external
variables:
- variable:
- name: description
+ - name: description
type: string
value:
- text: test
diff --git a/tests/dictionaries/80extra_externalspacecondition2/yml/00-base.yml b/tests/dictionaries/80extra_externalspacecondition2/yml/00-base.yml
index 374f4a91f..083ecd813 100644
--- a/tests/dictionaries/80extra_externalspacecondition2/yml/00-base.yml
+++ b/tests/dictionaries/80extra_externalspacecondition2/yml/00-base.yml
@@ -1,11 +1,11 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
description: "g\xE9n\xE9ral"
variables:
- variable:
- name: activer_ejabberd
+ - name: activer_ejabberd
type: string
description: No change
hidden: true
diff --git a/tests/dictionaries/80extra_externalspacecondition2/yml/extra_dirs/extra/00-base.yml b/tests/dictionaries/80extra_externalspacecondition2/yml/extra_dirs/extra/00-base.yml
index 61462b062..6722541d2 100644
--- a/tests/dictionaries/80extra_externalspacecondition2/yml/extra_dirs/extra/00-base.yml
+++ b/tests/dictionaries/80extra_externalspacecondition2/yml/extra_dirs/extra/00-base.yml
@@ -1,15 +1,14 @@
version: '0.10'
variables:
- family:
- name: ejabberd
+ - name: ejabberd
variables:
- variable:
- name: description
+ - name: description
type: string
value:
- text: Exportation de la base de ejabberd
- - variable:
- name: day
+ - name: day
type: choice
mandatory: true
choice:
@@ -19,8 +18,7 @@ variables:
- text: monthly
value:
- text: none
- - variable:
- name: mode
+ - name: mode
type: choice
mandatory: true
value:
diff --git a/tests/dictionaries/80extra_externalspacecondition2/yml/extra_dirs/extra1/00-base.yml b/tests/dictionaries/80extra_externalspacecondition2/yml/extra_dirs/extra1/00-base.yml
index 2fb0e1a51..5eb135976 100644
--- a/tests/dictionaries/80extra_externalspacecondition2/yml/extra_dirs/extra1/00-base.yml
+++ b/tests/dictionaries/80extra_externalspacecondition2/yml/extra_dirs/extra1/00-base.yml
@@ -1,10 +1,10 @@
version: '0.10'
variables:
- family:
- name: external
+ - name: external
variables:
- variable:
- name: description
+ - name: description
type: string
value:
- text: test
diff --git a/tests/dictionaries/80extra_externalspacecondition3/yml/00-base.yml b/tests/dictionaries/80extra_externalspacecondition3/yml/00-base.yml
index 374f4a91f..083ecd813 100644
--- a/tests/dictionaries/80extra_externalspacecondition3/yml/00-base.yml
+++ b/tests/dictionaries/80extra_externalspacecondition3/yml/00-base.yml
@@ -1,11 +1,11 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
description: "g\xE9n\xE9ral"
variables:
- variable:
- name: activer_ejabberd
+ - name: activer_ejabberd
type: string
description: No change
hidden: true
diff --git a/tests/dictionaries/80extra_externalspacecondition3/yml/extra_dirs/extra/00-base.yml b/tests/dictionaries/80extra_externalspacecondition3/yml/extra_dirs/extra/00-base.yml
index 41bcd4adf..2619ec3f2 100644
--- a/tests/dictionaries/80extra_externalspacecondition3/yml/extra_dirs/extra/00-base.yml
+++ b/tests/dictionaries/80extra_externalspacecondition3/yml/extra_dirs/extra/00-base.yml
@@ -1,10 +1,10 @@
version: '0.10'
variables:
- family:
- name: external
+ - name: external
variables:
- variable:
- name: description
+ - name: description
type: string
value:
- text: test
diff --git a/tests/dictionaries/80extra_rougail/yml/00-base.yml b/tests/dictionaries/80extra_rougail/yml/00-base.yml
index b0015aaa9..6311bc886 100644
--- a/tests/dictionaries/80extra_rougail/yml/00-base.yml
+++ b/tests/dictionaries/80extra_rougail/yml/00-base.yml
@@ -1,17 +1,16 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
variables:
- variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
type: string
description: No change
hidden: true
value:
- text: non
- - variable:
- name: activer_ejabberd
+ - name: activer_ejabberd
type: string
description: No change
hidden: true
diff --git a/tests/dictionaries/80extra_rougail/yml/extra_dirs/rougail/00-base.yml b/tests/dictionaries/80extra_rougail/yml/extra_dirs/rougail/00-base.yml
index c1c8b9065..1f90298c5 100644
--- a/tests/dictionaries/80extra_rougail/yml/extra_dirs/rougail/00-base.yml
+++ b/tests/dictionaries/80extra_rougail/yml/extra_dirs/rougail/00-base.yml
@@ -1,15 +1,14 @@
version: '0.10'
variables:
- family:
- name: ejabberd
+ - name: ejabberd
variables:
- variable:
- name: description
+ - name: description
type: string
value:
- text: Exportation de la base de ejabberd
- - variable:
- name: day
+ - name: day
type: choice
mandatory: true
choice:
@@ -19,8 +18,7 @@ variables:
- text: monthly
value:
- text: none
- - variable:
- name: mode
+ - name: mode
type: choice
mandatory: true
value:
diff --git a/tests/dictionaries/80extra_services/yml/00-base.yml b/tests/dictionaries/80extra_services/yml/00-base.yml
index b0015aaa9..6311bc886 100644
--- a/tests/dictionaries/80extra_services/yml/00-base.yml
+++ b/tests/dictionaries/80extra_services/yml/00-base.yml
@@ -1,17 +1,16 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
variables:
- variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
type: string
description: No change
hidden: true
value:
- text: non
- - variable:
- name: activer_ejabberd
+ - name: activer_ejabberd
type: string
description: No change
hidden: true
diff --git a/tests/dictionaries/80extra_services/yml/extra_dirs/services/00-base.yml b/tests/dictionaries/80extra_services/yml/extra_dirs/services/00-base.yml
index 309fa3132..2a9471564 100644
--- a/tests/dictionaries/80extra_services/yml/extra_dirs/services/00-base.yml
+++ b/tests/dictionaries/80extra_services/yml/extra_dirs/services/00-base.yml
@@ -1,15 +1,14 @@
version: '0.10'
variables:
- family:
- name: ejabberd
+ - name: ejabberd
variables:
- variable:
- name: description
+ - name: description
type: string
value:
- text: Exportation de la base de ejabberd
- - variable:
- name: day
+ - name: day
type: choice
mandatory: true
choice:
@@ -19,8 +18,7 @@ variables:
- text: monthly
value:
- text: none
- - variable:
- name: mode
+ - name: mode
type: choice
mandatory: true
value:
diff --git a/tests/dictionaries/80family_appendaccent/yml/00-base.yml b/tests/dictionaries/80family_appendaccent/yml/00-base.yml
index e44a4a0d0..fcebd6b2d 100644
--- a/tests/dictionaries/80family_appendaccent/yml/00-base.yml
+++ b/tests/dictionaries/80family_appendaccent/yml/00-base.yml
@@ -1,19 +1,18 @@
version: '0.10'
variables:
- family:
- name: "G\xE9n\xE9ral"
+ - name: "G\xE9n\xE9ral"
variables:
- variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
type: string
description: No change
value:
- text: non
-- family:
- name: Other
+ - name: Other
variables:
- variable:
- name: mode_conteneur_actif3
+ - name: mode_conteneur_actif3
type: string
description: No change
hidden: true
diff --git a/tests/dictionaries/80family_appendaccent/yml/01-base.yml b/tests/dictionaries/80family_appendaccent/yml/01-base.yml
index 8d854b190..5a571d63e 100644
--- a/tests/dictionaries/80family_appendaccent/yml/01-base.yml
+++ b/tests/dictionaries/80family_appendaccent/yml/01-base.yml
@@ -1,10 +1,10 @@
version: '0.10'
variables:
- family:
- name: "G\xE9n\xE9ral"
+ - name: "G\xE9n\xE9ral"
variables:
- variable:
- name: mode_conteneur_actif1
+ - name: mode_conteneur_actif1
type: string
description: No change
hidden: true
diff --git a/tests/dictionaries/80family_appendaccent/yml/02-base.yml b/tests/dictionaries/80family_appendaccent/yml/02-base.yml
index 0f3f013fb..2841f2739 100644
--- a/tests/dictionaries/80family_appendaccent/yml/02-base.yml
+++ b/tests/dictionaries/80family_appendaccent/yml/02-base.yml
@@ -1,10 +1,10 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
variables:
- variable:
- name: mode_conteneur_actif2
+ - name: mode_conteneur_actif2
type: string
description: No change
hidden: true
diff --git a/tests/dictionaries/80family_change/yml/00-base.yml b/tests/dictionaries/80family_change/yml/00-base.yml
index 17899785d..eabf5c947 100644
--- a/tests/dictionaries/80family_change/yml/00-base.yml
+++ b/tests/dictionaries/80family_change/yml/00-base.yml
@@ -1,17 +1,16 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
variables:
- variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
type: string
description: No change
hidden: true
value:
- text: non
- - variable:
- name: mode_conteneur_actif1
+ - name: mode_conteneur_actif1
type: string
description: No change
hidden: true
diff --git a/tests/dictionaries/80family_change/yml/01-base.yml b/tests/dictionaries/80family_change/yml/01-base.yml
index 361c4bddd..0acfbb1b0 100644
--- a/tests/dictionaries/80family_change/yml/01-base.yml
+++ b/tests/dictionaries/80family_change/yml/01-base.yml
@@ -1,10 +1,10 @@
version: '0.10'
variables:
- family:
- name: other
+ - name: other
variables:
- variable:
- name: mode_conteneur_actif1
+ - name: mode_conteneur_actif1
redefine: true
value:
- text: non
diff --git a/tests/dictionaries/80family_dynamic_calc_invalid_suffix/yml/00-base.yml b/tests/dictionaries/80family_dynamic_calc_invalid_suffix/yml/00-base.yml
index 0e87ae230..3beffce93 100644
--- a/tests/dictionaries/80family_dynamic_calc_invalid_suffix/yml/00-base.yml
+++ b/tests/dictionaries/80family_dynamic_calc_invalid_suffix/yml/00-base.yml
@@ -1,31 +1,29 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
variables:
- variable:
- name: varname
+ - name: varname
type: string
description: No change
multi: true
value:
- text: val1
- text: val2
-- family:
- name: dyn
+ - name: dyn
dynamic: varname
variables:
- variable:
- name: vardyn
+ - name: vardyn
type: string
description: No change
value:
- text: val
-- family:
- name: new
+ - name: new
variables:
- variable:
- name: newvar
+ - name: newvar
type: string
description: No change
constraints:
diff --git a/tests/dictionaries/80family_dynamic_check/yml/00-base.yml b/tests/dictionaries/80family_dynamic_check/yml/00-base.yml
index 620a4f99b..deb8769ce 100644
--- a/tests/dictionaries/80family_dynamic_check/yml/00-base.yml
+++ b/tests/dictionaries/80family_dynamic_check/yml/00-base.yml
@@ -1,22 +1,21 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
variables:
- variable:
- name: varname
+ - name: varname
type: string
description: No change
multi: true
value:
- text: val1
- text: val2
-- family:
- name: dyn
+ - name: dyn
dynamic: varname
variables:
- variable:
- name: vardyn
+ - name: vardyn
type: number
description: No change
constraints:
diff --git a/tests/dictionaries/80family_dynamic_not_multi/yml/00-base.yml b/tests/dictionaries/80family_dynamic_not_multi/yml/00-base.yml
index c0b0ade5d..81f4bab6a 100644
--- a/tests/dictionaries/80family_dynamic_not_multi/yml/00-base.yml
+++ b/tests/dictionaries/80family_dynamic_not_multi/yml/00-base.yml
@@ -1,19 +1,18 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
variables:
- variable:
- name: varname
+ - name: varname
type: string
description: No change
value:
- text: val1
-- family:
- name: dyn
+ - name: dyn
dynamic: varname
variables:
- variable:
- name: vardyn
+ - name: vardyn
type: string
description: No change
diff --git a/tests/dictionaries/80family_dynamic_with_family/yml/00-base.yml b/tests/dictionaries/80family_dynamic_with_family/yml/00-base.yml
index af4021ef8..52f0a3015 100644
--- a/tests/dictionaries/80family_dynamic_with_family/yml/00-base.yml
+++ b/tests/dictionaries/80family_dynamic_with_family/yml/00-base.yml
@@ -1,26 +1,25 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
variables:
- variable:
- name: varname
+ - name: varname
type: string
description: No change
multi: true
value:
- text: val1
- text: val2
-- family:
- name: dyn
+ - name: dyn
dynamic: varname
variables:
- variable:
- name: vardyn
+ - name: vardyn
type: string
description: No change
- family:
- name: my_family
+ - name: my_family
variables:
- variable:
- name: vardyn2
+ - name: vardyn2
diff --git a/tests/dictionaries/80family_not_dynamic_calc_suffix/yml/00-base.yml b/tests/dictionaries/80family_not_dynamic_calc_suffix/yml/00-base.yml
index 259931ac8..3d906432d 100644
--- a/tests/dictionaries/80family_not_dynamic_calc_suffix/yml/00-base.yml
+++ b/tests/dictionaries/80family_not_dynamic_calc_suffix/yml/00-base.yml
@@ -1,31 +1,29 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
variables:
- variable:
- name: varname
+ - name: varname
type: string
description: No change
multi: true
value:
- text: val1
- text: val2
-- family:
- name: dyn
+ - name: dyn
dynamic: varname
variables:
- variable:
- name: vardyn
+ - name: vardyn
type: string
description: No change
value:
- text: val
-- family:
- name: new
+ - name: new
variables:
- variable:
- name: newvar
+ - name: newvar
type: string
description: No change
constraints:
diff --git a/tests/dictionaries/80family_only_on_suffix/yml/00-base.yml b/tests/dictionaries/80family_only_on_suffix/yml/00-base.yml
index 466bcdd0f..3f574b9af 100644
--- a/tests/dictionaries/80family_only_on_suffix/yml/00-base.yml
+++ b/tests/dictionaries/80family_only_on_suffix/yml/00-base.yml
@@ -1,22 +1,21 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
variables:
- variable:
- name: varname
+ - name: varname
type: string
description: No change
multi: true
value:
- text: val1
- text: val2
-- family:
- name: dyn
+ - name: dyn
dynamic: varname
variables:
- variable:
- name: vardyn
+ - name: vardyn
type: string
description: No change
constraints:
diff --git a/tests/dictionaries/80family_several/yml/00-base.yml b/tests/dictionaries/80family_several/yml/00-base.yml
index 18076f9b3..fc62069e4 100644
--- a/tests/dictionaries/80family_several/yml/00-base.yml
+++ b/tests/dictionaries/80family_several/yml/00-base.yml
@@ -1,34 +1,31 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
variables:
- variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
type: string
description: No change
value:
- text: non
-- family:
- name: general
+ - name: general
variables:
- family:
- name: leader
+ - name: leader
description: leader
leadership: true
variables:
- variable:
- name: leader
+ - name: leader
type: string
description: leader
multi: true
- - variable:
- name: follower1
+ - name: follower1
type: string
description: follower1
multi: true
- - variable:
- name: follower2
+ - name: follower2
type: string
description: follower2
multi: true
diff --git a/tests/dictionaries/80family_unique/yml/00-base.yml b/tests/dictionaries/80family_unique/yml/00-base.yml
index 346581193..67d9c9c51 100644
--- a/tests/dictionaries/80family_unique/yml/00-base.yml
+++ b/tests/dictionaries/80family_unique/yml/00-base.yml
@@ -1,10 +1,10 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
variables:
- family:
- name: general
+ - name: general
variables:
- variable:
- name: my_variable
+ - name: my_variable
diff --git a/tests/dictionaries/80familyaction_accent/yml/00-base.yml b/tests/dictionaries/80familyaction_accent/yml/00-base.yml
index bddc746a9..d0acda026 100644
--- a/tests/dictionaries/80familyaction_accent/yml/00-base.yml
+++ b/tests/dictionaries/80familyaction_accent/yml/00-base.yml
@@ -1,10 +1,10 @@
version: '0.10'
variables:
- family:
- name: "g\xE9n\xE9ral"
+ - name: "g\xE9n\xE9ral"
variables:
- variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
type: string
description: No change
hidden: true
diff --git a/tests/dictionaries/80familyaction_accent/yml/extra_dirs/extra/00-base.yml b/tests/dictionaries/80familyaction_accent/yml/extra_dirs/extra/00-base.yml
index 8b854298f..e28f2266e 100644
--- a/tests/dictionaries/80familyaction_accent/yml/extra_dirs/extra/00-base.yml
+++ b/tests/dictionaries/80familyaction_accent/yml/extra_dirs/extra/00-base.yml
@@ -1,10 +1,10 @@
version: '0.10'
variables:
- family:
- name: test
+ - name: test
variables:
- variable:
- name: delay
+ - name: delay
type: number
description: "d\xE9lai en minutes avant lancement"
value:
diff --git a/tests/dictionaries/80file_wrong_type/yml/00-base.yml b/tests/dictionaries/80file_wrong_type/yml/00-base.yml
index d0bae506e..18a485d0b 100644
--- a/tests/dictionaries/80file_wrong_type/yml/00-base.yml
+++ b/tests/dictionaries/80file_wrong_type/yml/00-base.yml
@@ -8,7 +8,7 @@ services:
text: file_name
variables:
- variable:
- name: file_name
+ - name: file_name
type: string
value:
- text: /etc/mailname
diff --git a/tests/dictionaries/80fill_baseaccent/yml/00-base.yml b/tests/dictionaries/80fill_baseaccent/yml/00-base.yml
index b57ee3c59..bd68bf785 100644
--- a/tests/dictionaries/80fill_baseaccent/yml/00-base.yml
+++ b/tests/dictionaries/80fill_baseaccent/yml/00-base.yml
@@ -1,17 +1,16 @@
version: '0.10'
variables:
- family:
- name: "G\xE9n\xE9ral"
+ - name: "G\xE9n\xE9ral"
variables:
- variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
type: string
description: No change
hidden: true
value:
- text: non
- - variable:
- name: mode_conteneur_actif1
+ - name: mode_conteneur_actif1
type: string
description: No change
value:
diff --git a/tests/dictionaries/80fill_error/yml/00-base.yml b/tests/dictionaries/80fill_error/yml/00-base.yml
index 95574a4df..f2de42fe9 100644
--- a/tests/dictionaries/80fill_error/yml/00-base.yml
+++ b/tests/dictionaries/80fill_error/yml/00-base.yml
@@ -1,10 +1,10 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
variables:
- variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
type: string
description: No change
hidden: true
diff --git a/tests/dictionaries/80fill_multi/yml/00-base.yml b/tests/dictionaries/80fill_multi/yml/00-base.yml
index dd1b4dc31..3ce0941c5 100644
--- a/tests/dictionaries/80fill_multi/yml/00-base.yml
+++ b/tests/dictionaries/80fill_multi/yml/00-base.yml
@@ -1,17 +1,16 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
variables:
- variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
type: string
description: No change
hidden: true
value:
- text: non
- - variable:
- name: mode_conteneur_actif1
+ - name: mode_conteneur_actif1
type: string
description: No change
value:
diff --git a/tests/dictionaries/80fill_not_exists/yml/00-base.yml b/tests/dictionaries/80fill_not_exists/yml/00-base.yml
index bb0f5bb6c..6a8793edd 100644
--- a/tests/dictionaries/80fill_not_exists/yml/00-base.yml
+++ b/tests/dictionaries/80fill_not_exists/yml/00-base.yml
@@ -1,17 +1,16 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
variables:
- variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
type: string
description: No change
hidden: true
value:
- text: non
- - variable:
- name: mode_conteneur_actif1
+ - name: mode_conteneur_actif1
type: string
description: No change
value:
diff --git a/tests/dictionaries/80fill_unknown_function/yml/00-base.yml b/tests/dictionaries/80fill_unknown_function/yml/00-base.yml
index de08e5db2..789438bf0 100644
--- a/tests/dictionaries/80fill_unknown_function/yml/00-base.yml
+++ b/tests/dictionaries/80fill_unknown_function/yml/00-base.yml
@@ -1,14 +1,13 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
variables:
- variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
type: string
description: No change
- - variable:
- name: mode_conteneur_actif1
+ - name: mode_conteneur_actif1
type: string
description: No change
value:
diff --git a/tests/dictionaries/80frozenifin_unknown/yml/00-base.yml b/tests/dictionaries/80frozenifin_unknown/yml/00-base.yml
index e7adda643..7035d392c 100644
--- a/tests/dictionaries/80frozenifin_unknown/yml/00-base.yml
+++ b/tests/dictionaries/80frozenifin_unknown/yml/00-base.yml
@@ -1,21 +1,20 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
mode: expert
variables:
- variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
type: string
description: No change
value:
- text: non
-- family:
- name: enumfam
+ - name: enumfam
mode: expert
variables:
- variable:
- name: enumvar
+ - name: enumvar
type: choice
description: enumvar
help: bla bla bla
@@ -29,8 +28,7 @@ variables:
value:
- type: number
text: 1
- - variable:
- name: test_variable
+ - name: test_variable
type: number
description: test variable
constraints:
diff --git a/tests/dictionaries/80hidden_if_in_dynamic/yml/00-base.yml b/tests/dictionaries/80hidden_if_in_dynamic/yml/00-base.yml
index ebbead15b..0e942f97b 100644
--- a/tests/dictionaries/80hidden_if_in_dynamic/yml/00-base.yml
+++ b/tests/dictionaries/80hidden_if_in_dynamic/yml/00-base.yml
@@ -1,31 +1,29 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
variables:
- variable:
- name: varname
+ - name: varname
type: string
description: No change
multi: true
value:
- text: val1
- text: val2
-- family:
- name: dyn
+ - name: dyn
dynamic: varname
variables:
- variable:
- name: vardyn
+ - name: vardyn
type: string
description: No change
value:
- text: val
-- family:
- name: new
+ - name: new
variables:
- variable:
- name: newvar
+ - name: newvar
type: string
description: No change
constraints:
diff --git a/tests/dictionaries/80hidden_if_in_filelist/yml/00-base.yml b/tests/dictionaries/80hidden_if_in_filelist/yml/00-base.yml
index b9aa0ab31..d0c921063 100644
--- a/tests/dictionaries/80hidden_if_in_filelist/yml/00-base.yml
+++ b/tests/dictionaries/80hidden_if_in_filelist/yml/00-base.yml
@@ -7,17 +7,16 @@ services:
text: /tmp/file1
variables:
- family:
- name: general
+ - name: general
variables:
- variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
type: string
description: No change
hidden: true
value:
- text: non
- - variable:
- name: condition
+ - name: condition
type: string
description: No change
value:
diff --git a/tests/dictionaries/80invalid_bool/yml/00-base.yml b/tests/dictionaries/80invalid_bool/yml/00-base.yml
index ecd767b63..422864221 100644
--- a/tests/dictionaries/80invalid_bool/yml/00-base.yml
+++ b/tests/dictionaries/80invalid_bool/yml/00-base.yml
@@ -1,7 +1,7 @@
version: '0.10'
variables:
- variable:
- name: server_deployed
+ - name: server_deployed
type: boolean
value:
- text: 'no'
diff --git a/tests/dictionaries/80leadership_accent/yml/00-base.yml b/tests/dictionaries/80leadership_accent/yml/00-base.yml
index 2a28fa147..a89f11c08 100644
--- a/tests/dictionaries/80leadership_accent/yml/00-base.yml
+++ b/tests/dictionaries/80leadership_accent/yml/00-base.yml
@@ -1,31 +1,28 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
variables:
- variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
type: string
description: No change
value:
- text: non
-- family:
- name: general1
+ - name: general1
variables:
- family:
- name: leader
+ - name: leader
description: leader
leadership: true
variables:
- variable:
- name: leader
+ - name: leader
type: string
multi: true
- - variable:
- name: "Follow\xE9r1"
+ - name: "Follow\xE9r1"
type: string
- - variable:
- name: "Follow\xE9r2"
+ - name: "Follow\xE9r2"
type: string
constraints:
- fill:
diff --git a/tests/dictionaries/80leadership_accent_leader/yml/00-base.yml b/tests/dictionaries/80leadership_accent_leader/yml/00-base.yml
index 681efc22d..fd2cbf726 100644
--- a/tests/dictionaries/80leadership_accent_leader/yml/00-base.yml
+++ b/tests/dictionaries/80leadership_accent_leader/yml/00-base.yml
@@ -1,31 +1,28 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
variables:
- variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
type: string
description: No change
value:
- text: non
-- family:
- name: general1
+ - name: general1
variables:
- family:
- name: "L\xE9ader"
+ - name: "L\xE9ader"
description: "L\xE9ader"
leadership: true
variables:
- variable:
- name: "L\xE9ader"
+ - name: "L\xE9ader"
type: string
multi: true
- - variable:
- name: follower1
+ - name: follower1
type: string
- - variable:
- name: follower2
+ - name: follower2
type: string
constraints:
- fill:
diff --git a/tests/dictionaries/80leadership_auto_save/yml/00-base.yml b/tests/dictionaries/80leadership_auto_save/yml/00-base.yml
index 837d8cab3..a5533aa02 100644
--- a/tests/dictionaries/80leadership_auto_save/yml/00-base.yml
+++ b/tests/dictionaries/80leadership_auto_save/yml/00-base.yml
@@ -1,33 +1,31 @@
version: '0.10'
variables:
- variable:
- name: server_deployed
+ - name: server_deployed
type: boolean
- family:
- name: general
+ - name: general
variables:
- variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
type: string
description: No change
value:
- text: non
- family:
- name: leader
+ - name: leader
description: leader
leadership: true
variables:
- variable:
- name: leader
+ - name: leader
type: string
description: leader
multi: true
- - variable:
- name: follower1
+ - name: follower1
type: string
description: follower1
- - variable:
- name: follower2
+ - name: follower2
type: string
description: follower2
auto_save: true
diff --git a/tests/dictionaries/80leadership_autofreeze/yml/00-base.yml b/tests/dictionaries/80leadership_autofreeze/yml/00-base.yml
index f3d23f003..39869b343 100644
--- a/tests/dictionaries/80leadership_autofreeze/yml/00-base.yml
+++ b/tests/dictionaries/80leadership_autofreeze/yml/00-base.yml
@@ -1,26 +1,24 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
variables:
- variable:
- name: server_deployed
+ - name: server_deployed
type: boolean
- family:
- name: leader
+ - name: leader
description: leader
leadership: true
variables:
- variable:
- name: leader
+ - name: leader
description: leader
auto_freeze: true
multi: true
- - variable:
- name: follower1
+ - name: follower1
multi: true
- - variable:
- name: follower2
+ - name: follower2
multi: true
constraints:
- fill:
diff --git a/tests/dictionaries/80leadership_familyaccent/yml/00-base.yml b/tests/dictionaries/80leadership_familyaccent/yml/00-base.yml
index a116055c3..90bfa50a6 100644
--- a/tests/dictionaries/80leadership_familyaccent/yml/00-base.yml
+++ b/tests/dictionaries/80leadership_familyaccent/yml/00-base.yml
@@ -1,30 +1,28 @@
version: '0.10'
variables:
- family:
- name: "G\xE9n\xE9ral"
+ - name: "G\xE9n\xE9ral"
variables:
- variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
type: string
description: No change
value:
- text: non
- family:
- name: leader
+ - name: leader
description: leader
leadership: true
variables:
- variable:
- name: leader
+ - name: leader
type: string
description: leader
multi: true
- - variable:
- name: follower1
+ - name: follower1
type: string
description: follower1
- - variable:
- name: follower2
+ - name: follower2
type: string
description: follower2
constraints:
diff --git a/tests/dictionaries/80leadership_leader_not_multi/yml/00-base.yml b/tests/dictionaries/80leadership_leader_not_multi/yml/00-base.yml
index 68a25945b..5b551eec6 100644
--- a/tests/dictionaries/80leadership_leader_not_multi/yml/00-base.yml
+++ b/tests/dictionaries/80leadership_leader_not_multi/yml/00-base.yml
@@ -1,31 +1,28 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
variables:
- variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
type: string
description: No change
value:
- text: non
-- family:
- name: general1
+ - name: general1
variables:
- family:
- name: leader
+ - name: leader
description: leader
leadership: true
variables:
- variable:
- name: leader
+ - name: leader
type: string
description: leader
- - variable:
- name: follower1
+ - name: follower1
type: string
description: follower1
- - variable:
- name: follower2
+ - name: follower2
type: string
description: follower2
diff --git a/tests/dictionaries/80leadership_mandatoryfollower_multi_value/yml/00-base.yml b/tests/dictionaries/80leadership_mandatoryfollower_multi_value/yml/00-base.yml
index 8e6e548fd..6a55a2d44 100644
--- a/tests/dictionaries/80leadership_mandatoryfollower_multi_value/yml/00-base.yml
+++ b/tests/dictionaries/80leadership_mandatoryfollower_multi_value/yml/00-base.yml
@@ -1,28 +1,27 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
description: "g\xE9n\xE9ral"
variables:
- variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
type: string
description: No change
hidden: true
value:
- text: oui
- family:
- name: nut_monitor_netmask
+ - name: nut_monitor_netmask
description: "Masque de l'IP du r\xE9seau de l'esclave"
leadership: true
variables:
- variable:
- name: nut_monitor_netmask
+ - name: nut_monitor_netmask
type: netmask
description: "Masque de l'IP du r\xE9seau de l'esclave"
multi: true
- - variable:
- name: nut_monitor_host
+ - name: nut_monitor_host
type: network
description: "Adresse IP du r\xE9seau de l'esclave"
mandatory: true
diff --git a/tests/dictionaries/80load_autofreeze_no_variable/yml/00-base.yml b/tests/dictionaries/80load_autofreeze_no_variable/yml/00-base.yml
index ab125d4d2..84bbacc73 100644
--- a/tests/dictionaries/80load_autofreeze_no_variable/yml/00-base.yml
+++ b/tests/dictionaries/80load_autofreeze_no_variable/yml/00-base.yml
@@ -1,7 +1,7 @@
version: '0.10'
variables:
- variable:
- name: myvar
+ - name: myvar
auto_freeze: true
value:
- text: 'no'
diff --git a/tests/dictionaries/80load_disabled_if_inaccent_family/yml/00-base.yml b/tests/dictionaries/80load_disabled_if_inaccent_family/yml/00-base.yml
index 3af801ee4..c16ecf8d9 100644
--- a/tests/dictionaries/80load_disabled_if_inaccent_family/yml/00-base.yml
+++ b/tests/dictionaries/80load_disabled_if_inaccent_family/yml/00-base.yml
@@ -1,31 +1,28 @@
version: '0.10'
variables:
- family:
- name: "G\xE9n\xE9ral"
+ - name: "G\xE9n\xE9ral"
variables:
- variable:
- name: condition
+ - name: condition
type: string
description: No change
value:
- text: non
- - variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
type: string
description: No change
value:
- text: non
- - variable:
- name: mode_conteneur_actif2
+ - name: mode_conteneur_actif2
type: string
description: No change
value:
- text: non
-- family:
- name: "G\xE9n\xE9ral2"
+ - name: "G\xE9n\xE9ral2"
variables:
- variable:
- name: mode_conteneur_actif3
+ - name: mode_conteneur_actif3
type: string
description: No change
hidden: true
diff --git a/tests/dictionaries/80load_leadership_normalize_family/yml/00-base.yml b/tests/dictionaries/80load_leadership_normalize_family/yml/00-base.yml
index f5b2f6cc6..cd3156836 100644
--- a/tests/dictionaries/80load_leadership_normalize_family/yml/00-base.yml
+++ b/tests/dictionaries/80load_leadership_normalize_family/yml/00-base.yml
@@ -1,32 +1,29 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
variables:
- variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
type: string
description: No change
value:
- text: non
-- family:
- name: general-1
+ - name: general-1
variables:
- family:
- name: leader
+ - name: leader
description: leader
leadership: true
variables:
- variable:
- name: leader
+ - name: leader
type: string
description: leader
multi: true
- - variable:
- name: follower1
+ - name: follower1
type: string
description: follower1
- - variable:
- name: follower2
+ - name: follower2
type: string
description: follower2
diff --git a/tests/dictionaries/80load_leadership_normalize_family/yml/01-base.yml b/tests/dictionaries/80load_leadership_normalize_family/yml/01-base.yml
index c5a9051d5..10f761965 100644
--- a/tests/dictionaries/80load_leadership_normalize_family/yml/01-base.yml
+++ b/tests/dictionaries/80load_leadership_normalize_family/yml/01-base.yml
@@ -1,9 +1,9 @@
version: '0.10'
variables:
- family:
- name: general-1
+ - name: general-1
variables:
- variable:
- name: leader
+ - name: leader
redefine: true
mandatory: true
diff --git a/tests/dictionaries/80load_mandatoryifin_family/yml/00-base.yml b/tests/dictionaries/80load_mandatoryifin_family/yml/00-base.yml
index 282c5ee99..9188aee66 100644
--- a/tests/dictionaries/80load_mandatoryifin_family/yml/00-base.yml
+++ b/tests/dictionaries/80load_mandatoryifin_family/yml/00-base.yml
@@ -1,16 +1,15 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
variables:
- variable:
- name: condition
+ - name: condition
type: boolean
-- family:
- name: general2
+ - name: general2
variables:
- variable:
- name: my_variable
+ - name: my_variable
constraints:
- condition:
- name: mandatory_if_in
diff --git a/tests/dictionaries/80mode_conflict/yml/00-base.yml b/tests/dictionaries/80mode_conflict/yml/00-base.yml
index 237399bbf..1e938c94b 100644
--- a/tests/dictionaries/80mode_conflict/yml/00-base.yml
+++ b/tests/dictionaries/80mode_conflict/yml/00-base.yml
@@ -1,14 +1,14 @@
version: '0.10'
variables:
- variable:
- name: server_deployed
+ - name: server_deployed
type: boolean
- family:
- name: general
+ - name: general
mode: normal
variables:
- variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
type: string
description: No change
mode: expert
diff --git a/tests/dictionaries/80mode_leadership_conflict/yml/00-base.yml b/tests/dictionaries/80mode_leadership_conflict/yml/00-base.yml
index 99cfd3752..224501498 100644
--- a/tests/dictionaries/80mode_leadership_conflict/yml/00-base.yml
+++ b/tests/dictionaries/80mode_leadership_conflict/yml/00-base.yml
@@ -1,36 +1,33 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
mode: expert
variables:
- variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
type: string
description: No change
value:
- text: non
-- family:
- name: leadermode
+ - name: leadermode
variables:
- family:
- name: leader
+ - name: leader
description: leader
leadership: true
variables:
- variable:
- name: leader
+ - name: leader
type: string
description: leader
multi: true
mode: expert
- - variable:
- name: follower1
+ - name: follower1
type: string
description: follower1
mode: normal
- - variable:
- name: follower2
+ - name: follower2
type: string
description: follower2
constraints:
diff --git a/tests/dictionaries/80multi_family_mode_conflict/yml/00-base.yml b/tests/dictionaries/80multi_family_mode_conflict/yml/00-base.yml
index 4fd160042..91bb42e8b 100644
--- a/tests/dictionaries/80multi_family_mode_conflict/yml/00-base.yml
+++ b/tests/dictionaries/80multi_family_mode_conflict/yml/00-base.yml
@@ -1,12 +1,12 @@
version: '0.10'
variables:
- family:
- name: base
+ - name: base
mode: expert
variables:
- family:
- name: subfamily
+ - name: subfamily
variables:
- variable:
- name: variable
+ - name: variable
mode: basic
diff --git a/tests/dictionaries/80nil_with_value/yml/00-base.yml b/tests/dictionaries/80nil_with_value/yml/00-base.yml
index 4f76d85e1..e47247dd3 100644
--- a/tests/dictionaries/80nil_with_value/yml/00-base.yml
+++ b/tests/dictionaries/80nil_with_value/yml/00-base.yml
@@ -1,23 +1,21 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
variables:
- variable:
- name: condition
+ - name: condition
type: string
description: No change
value:
- text: non
- - variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
type: string
description: No change
hidden: true
value:
- text: non
- - variable:
- name: mode_conteneur_actif2
+ - name: mode_conteneur_actif2
type: string
description: No change
hidden: true
diff --git a/tests/dictionaries/80no_leadership_index/yml/00-base.yml b/tests/dictionaries/80no_leadership_index/yml/00-base.yml
index 62ab6ec92..a0f69f0e1 100644
--- a/tests/dictionaries/80no_leadership_index/yml/00-base.yml
+++ b/tests/dictionaries/80no_leadership_index/yml/00-base.yml
@@ -1,7 +1,7 @@
version: '0.10'
variables:
- variable:
- name: my_variable
+ - name: my_variable
constraints:
- fill:
- name: calc_val
diff --git a/tests/dictionaries/80redefine_double_error/yml/00-base.yml b/tests/dictionaries/80redefine_double_error/yml/00-base.yml
index 7f2e268d0..8617016fb 100644
--- a/tests/dictionaries/80redefine_double_error/yml/00-base.yml
+++ b/tests/dictionaries/80redefine_double_error/yml/00-base.yml
@@ -1,10 +1,10 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
variables:
- variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
type: string
description: Redefine description
hidden: true
diff --git a/tests/dictionaries/80redefine_double_error/yml/01-base.yml b/tests/dictionaries/80redefine_double_error/yml/01-base.yml
index 5dd85ad37..55007491c 100644
--- a/tests/dictionaries/80redefine_double_error/yml/01-base.yml
+++ b/tests/dictionaries/80redefine_double_error/yml/01-base.yml
@@ -1,8 +1,8 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
variables:
- variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
redefine: true
diff --git a/tests/dictionaries/80redefine_double_error/yml/02-base.yml b/tests/dictionaries/80redefine_double_error/yml/02-base.yml
index de0bb23af..de7546c31 100644
--- a/tests/dictionaries/80redefine_double_error/yml/02-base.yml
+++ b/tests/dictionaries/80redefine_double_error/yml/02-base.yml
@@ -1,9 +1,9 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
variables:
- variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
redefine: true
type: string
diff --git a/tests/dictionaries/80redefine_error/yml/00-base.yml b/tests/dictionaries/80redefine_error/yml/00-base.yml
index 7f2e268d0..8617016fb 100644
--- a/tests/dictionaries/80redefine_error/yml/00-base.yml
+++ b/tests/dictionaries/80redefine_error/yml/00-base.yml
@@ -1,10 +1,10 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
variables:
- variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
type: string
description: Redefine description
hidden: true
diff --git a/tests/dictionaries/80redefine_error/yml/01-redefine.yml b/tests/dictionaries/80redefine_error/yml/01-redefine.yml
index 7f2e268d0..8617016fb 100644
--- a/tests/dictionaries/80redefine_error/yml/01-redefine.yml
+++ b/tests/dictionaries/80redefine_error/yml/01-redefine.yml
@@ -1,10 +1,10 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
variables:
- variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
type: string
description: Redefine description
hidden: true
diff --git a/tests/dictionaries/80redefine_fillerror/yml/00-base.yml b/tests/dictionaries/80redefine_fillerror/yml/00-base.yml
index 70eba1c86..6b4ccf688 100644
--- a/tests/dictionaries/80redefine_fillerror/yml/00-base.yml
+++ b/tests/dictionaries/80redefine_fillerror/yml/00-base.yml
@@ -1,10 +1,10 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
variables:
- variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
type: string
description: No change
hidden: true
diff --git a/tests/dictionaries/80redefine_notexists/yml/00-base.yml b/tests/dictionaries/80redefine_notexists/yml/00-base.yml
index 7f2e268d0..8617016fb 100644
--- a/tests/dictionaries/80redefine_notexists/yml/00-base.yml
+++ b/tests/dictionaries/80redefine_notexists/yml/00-base.yml
@@ -1,10 +1,10 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
variables:
- variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
type: string
description: Redefine description
hidden: true
diff --git a/tests/dictionaries/80redefine_notexists/yml/01-redefine.yml b/tests/dictionaries/80redefine_notexists/yml/01-redefine.yml
index 88423de33..b8d2da776 100644
--- a/tests/dictionaries/80redefine_notexists/yml/01-redefine.yml
+++ b/tests/dictionaries/80redefine_notexists/yml/01-redefine.yml
@@ -1,10 +1,10 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
variables:
- variable:
- name: mode_conteneur_actif1
+ - name: mode_conteneur_actif1
redefine: true
value:
- text: non
diff --git a/tests/dictionaries/80redefine_type/yml/00-base.yml b/tests/dictionaries/80redefine_type/yml/00-base.yml
index 7f2e268d0..8617016fb 100644
--- a/tests/dictionaries/80redefine_type/yml/00-base.yml
+++ b/tests/dictionaries/80redefine_type/yml/00-base.yml
@@ -1,10 +1,10 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
variables:
- variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
type: string
description: Redefine description
hidden: true
diff --git a/tests/dictionaries/80redefine_type/yml/01-redefine.yml b/tests/dictionaries/80redefine_type/yml/01-redefine.yml
index 3c60a758a..26f0d4647 100644
--- a/tests/dictionaries/80redefine_type/yml/01-redefine.yml
+++ b/tests/dictionaries/80redefine_type/yml/01-redefine.yml
@@ -1,9 +1,9 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
variables:
- variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
redefine: true
type: number
diff --git a/tests/dictionaries/80service_not_managed_overrides/yml/00-base.yml b/tests/dictionaries/80service_not_managed_overrides/yml/00-base.yml
index af41ef063..89ae31dde 100644
--- a/tests/dictionaries/80service_not_managed_overrides/yml/00-base.yml
+++ b/tests/dictionaries/80service_not_managed_overrides/yml/00-base.yml
@@ -6,7 +6,7 @@ services:
override: null
variables:
- variable:
- name: var
+ - name: var
type: string
value:
- text: mailname
diff --git a/tests/dictionaries/80services_ip_cidr_netmask/yml/00-base.yml b/tests/dictionaries/80services_ip_cidr_netmask/yml/00-base.yml
index 3e4dfa146..9c6fbf46d 100644
--- a/tests/dictionaries/80services_ip_cidr_netmask/yml/00-base.yml
+++ b/tests/dictionaries/80services_ip_cidr_netmask/yml/00-base.yml
@@ -8,10 +8,9 @@ services:
text: nut_monitor_host
variables:
- variable:
- name: nut_monitor_host
+ - name: nut_monitor_host
type: network_cidr
mandatory: true
-- variable:
- name: nut_monitor_netmask
+ - name: nut_monitor_netmask
type: netmask
mandatory: true
diff --git a/tests/dictionaries/80services_ip_netmask/yml/00-base.yml b/tests/dictionaries/80services_ip_netmask/yml/00-base.yml
index 74c9caaea..7fd5490e1 100644
--- a/tests/dictionaries/80services_ip_netmask/yml/00-base.yml
+++ b/tests/dictionaries/80services_ip_netmask/yml/00-base.yml
@@ -7,10 +7,9 @@ services:
text: nut_monitor_host
variables:
- variable:
- name: nut_monitor_host
+ - name: nut_monitor_host
type: ip
mandatory: true
-- variable:
- name: nut_monitor_netmask
+ - name: nut_monitor_netmask
type: netmask
mandatory: true
diff --git a/tests/dictionaries/80services_ip_network_no_netmask/yml/00-base.yml b/tests/dictionaries/80services_ip_network_no_netmask/yml/00-base.yml
index 408decd83..e75ce2ef6 100644
--- a/tests/dictionaries/80services_ip_network_no_netmask/yml/00-base.yml
+++ b/tests/dictionaries/80services_ip_network_no_netmask/yml/00-base.yml
@@ -6,6 +6,6 @@ services:
- text: nut_monitor_host
variables:
- variable:
- name: nut_monitor_host
+ - name: nut_monitor_host
type: network
mandatory: true
diff --git a/tests/dictionaries/80services_ip_not_netmask/yml/00-base.yml b/tests/dictionaries/80services_ip_not_netmask/yml/00-base.yml
index b888409aa..37a009c0e 100644
--- a/tests/dictionaries/80services_ip_not_netmask/yml/00-base.yml
+++ b/tests/dictionaries/80services_ip_not_netmask/yml/00-base.yml
@@ -7,10 +7,9 @@ services:
text: nut_monitor_host
variables:
- variable:
- name: nut_monitor_host
+ - name: nut_monitor_host
type: network
mandatory: true
-- variable:
- name: nut_monitor_netmask
+ - name: nut_monitor_netmask
type: ip
mandatory: true
diff --git a/tests/dictionaries/80services_ip_wrong_type/yml/00-base.yml b/tests/dictionaries/80services_ip_wrong_type/yml/00-base.yml
index c644aca3b..02e72d8f7 100644
--- a/tests/dictionaries/80services_ip_wrong_type/yml/00-base.yml
+++ b/tests/dictionaries/80services_ip_wrong_type/yml/00-base.yml
@@ -6,7 +6,7 @@ services:
- text: nut_monitor_host
variables:
- variable:
- name: nut_monitor_host
+ - name: nut_monitor_host
type: string
mandatory: true
value:
diff --git a/tests/dictionaries/80target_list_unknown/yml/00-base.yml b/tests/dictionaries/80target_list_unknown/yml/00-base.yml
index 39ed58ec2..5ef8c8e53 100644
--- a/tests/dictionaries/80target_list_unknown/yml/00-base.yml
+++ b/tests/dictionaries/80target_list_unknown/yml/00-base.yml
@@ -1,7 +1,7 @@
version: '0.10'
variables:
- variable:
- name: condition
+ - name: condition
type: boolean
constraints:
- condition:
diff --git a/tests/dictionaries/80unknown_type/yml/00-base.yml b/tests/dictionaries/80unknown_type/yml/00-base.yml
index 7f59850f3..e22b03272 100644
--- a/tests/dictionaries/80unknown_type/yml/00-base.yml
+++ b/tests/dictionaries/80unknown_type/yml/00-base.yml
@@ -1,9 +1,9 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
variables:
- variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
type: unknown
description: Description
diff --git a/tests/dictionaries/80valid_entier_invalid_param/yml/00-base.yml b/tests/dictionaries/80valid_entier_invalid_param/yml/00-base.yml
index fc69b7ca7..ec5267d33 100644
--- a/tests/dictionaries/80valid_entier_invalid_param/yml/00-base.yml
+++ b/tests/dictionaries/80valid_entier_invalid_param/yml/00-base.yml
@@ -1,16 +1,15 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
variables:
- variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
type: string
description: No change
value:
- text: b
- - variable:
- name: int
+ - name: int
type: number
description: No change
constraints:
diff --git a/tests/dictionaries/80valid_entier_not_number/yml/00-base.yml b/tests/dictionaries/80valid_entier_not_number/yml/00-base.yml
index 964dc1a70..2cc6522c2 100644
--- a/tests/dictionaries/80valid_entier_not_number/yml/00-base.yml
+++ b/tests/dictionaries/80valid_entier_not_number/yml/00-base.yml
@@ -1,16 +1,15 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
variables:
- variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
type: string
description: No change
value:
- text: b
- - variable:
- name: int
+ - name: int
type: number
description: No change
constraints:
diff --git a/tests/dictionaries/80valid_entier_without_param/yml/00-base.yml b/tests/dictionaries/80valid_entier_without_param/yml/00-base.yml
index 7c41d5216..5325c9840 100644
--- a/tests/dictionaries/80valid_entier_without_param/yml/00-base.yml
+++ b/tests/dictionaries/80valid_entier_without_param/yml/00-base.yml
@@ -1,16 +1,15 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
variables:
- variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
type: string
description: No change
value:
- text: b
- - variable:
- name: int
+ - name: int
type: number
description: No change
constraints:
diff --git a/tests/dictionaries/80valid_enum_multi_param/yml/00-base.yml b/tests/dictionaries/80valid_enum_multi_param/yml/00-base.yml
index 5ca97a31e..cf0da6877 100644
--- a/tests/dictionaries/80valid_enum_multi_param/yml/00-base.yml
+++ b/tests/dictionaries/80valid_enum_multi_param/yml/00-base.yml
@@ -1,10 +1,10 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
variables:
- variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
type: choice
description: No change
value:
@@ -15,8 +15,7 @@ variables:
text: var
- type: string
text: d
- - variable:
- name: var
+ - name: var
type: string
description: New variable
multi: true
diff --git a/tests/dictionaries/80valid_enum_multi_variable/yml/00-base.yml b/tests/dictionaries/80valid_enum_multi_variable/yml/00-base.yml
index 385577a27..81d37d09c 100644
--- a/tests/dictionaries/80valid_enum_multi_variable/yml/00-base.yml
+++ b/tests/dictionaries/80valid_enum_multi_variable/yml/00-base.yml
@@ -1,10 +1,10 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
variables:
- variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
type: choice
description: No change
value:
@@ -15,8 +15,7 @@ variables:
text: var
- type: variable
text: var2
- - variable:
- name: var
+ - name: var
type: string
description: New variable
multi: true
@@ -24,8 +23,7 @@ variables:
- text: a
- text: b
- text: c
- - variable:
- name: var2
+ - name: var2
type: string
description: New variable
multi: true
diff --git a/tests/dictionaries/80valid_enum_no_choice/yml/00-base.yml b/tests/dictionaries/80valid_enum_no_choice/yml/00-base.yml
index 4e16c8676..33e938df0 100644
--- a/tests/dictionaries/80valid_enum_no_choice/yml/00-base.yml
+++ b/tests/dictionaries/80valid_enum_no_choice/yml/00-base.yml
@@ -1,21 +1,20 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
mode: expert
variables:
- variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
type: string
description: No change
value:
- text: non
-- family:
- name: enumfam
+ - name: enumfam
mode: expert
variables:
- variable:
- name: enumvar
+ - name: enumvar
type: choice
description: multi
help: bla bla bla
diff --git a/tests/dictionaries/80valid_enum_none_multi_variable/yml/00-base.yml b/tests/dictionaries/80valid_enum_none_multi_variable/yml/00-base.yml
index aad1da3c3..8dc771d63 100644
--- a/tests/dictionaries/80valid_enum_none_multi_variable/yml/00-base.yml
+++ b/tests/dictionaries/80valid_enum_none_multi_variable/yml/00-base.yml
@@ -1,10 +1,10 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
variables:
- variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
type: choice
description: No change
value:
@@ -13,8 +13,7 @@ variables:
choice:
- type: variable
text: var
- - variable:
- name: var
+ - name: var
type: string
description: New variable
value:
diff --git a/tests/dictionaries/80valid_enum_not_choice/yml/00-base.yml b/tests/dictionaries/80valid_enum_not_choice/yml/00-base.yml
index 01565c6a3..f47a2193a 100644
--- a/tests/dictionaries/80valid_enum_not_choice/yml/00-base.yml
+++ b/tests/dictionaries/80valid_enum_not_choice/yml/00-base.yml
@@ -1,21 +1,20 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
mode: expert
variables:
- variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
type: string
description: No change
value:
- text: non
-- family:
- name: enumfam
+ - name: enumfam
mode: expert
variables:
- variable:
- name: enumvar
+ - name: enumvar
type: string
description: multi
help: bla bla bla
diff --git a/tests/dictionaries/80valid_enum_number_without_value/yml/00-base.yml b/tests/dictionaries/80valid_enum_number_without_value/yml/00-base.yml
index c0fcc3f5d..236d81d57 100644
--- a/tests/dictionaries/80valid_enum_number_without_value/yml/00-base.yml
+++ b/tests/dictionaries/80valid_enum_number_without_value/yml/00-base.yml
@@ -1,21 +1,20 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
mode: expert
variables:
- variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
type: string
description: No change
value:
- text: non
-- family:
- name: enumfam
+ - name: enumfam
mode: expert
variables:
- variable:
- name: enumvar
+ - name: enumvar
type: choice
description: enumvar
help: bla bla bla
diff --git a/tests/dictionaries/80value_not_multi/yml/00-base.yml b/tests/dictionaries/80value_not_multi/yml/00-base.yml
index b2835586e..ed5db06dd 100644
--- a/tests/dictionaries/80value_not_multi/yml/00-base.yml
+++ b/tests/dictionaries/80value_not_multi/yml/00-base.yml
@@ -1,7 +1,7 @@
version: '0.10'
variables:
- variable:
- name: nut_monitor_host
+ - name: nut_monitor_host
type: ip
mandatory: true
value:
diff --git a/tests/dictionaries/80variable_accent/yml/00-base.yml b/tests/dictionaries/80variable_accent/yml/00-base.yml
index f61073358..6dd0d6d28 100644
--- a/tests/dictionaries/80variable_accent/yml/00-base.yml
+++ b/tests/dictionaries/80variable_accent/yml/00-base.yml
@@ -1,19 +1,18 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
variables:
- variable:
- name: "variableAccent\xE9"
+ - name: "variableAccent\xE9"
type: string
description: No change
value:
- text: non
-- family:
- name: Other
+ - name: Other
variables:
- variable:
- name: mode_conteneur_actif3
+ - name: mode_conteneur_actif3
type: string
description: No change
hidden: true
diff --git a/tests/dictionaries/80variable_accent/yml/01-base.yml b/tests/dictionaries/80variable_accent/yml/01-base.yml
index 8d854b190..5a571d63e 100644
--- a/tests/dictionaries/80variable_accent/yml/01-base.yml
+++ b/tests/dictionaries/80variable_accent/yml/01-base.yml
@@ -1,10 +1,10 @@
version: '0.10'
variables:
- family:
- name: "G\xE9n\xE9ral"
+ - name: "G\xE9n\xE9ral"
variables:
- variable:
- name: mode_conteneur_actif1
+ - name: mode_conteneur_actif1
type: string
description: No change
hidden: true
diff --git a/tests/dictionaries/80variable_accent/yml/02-base.yml b/tests/dictionaries/80variable_accent/yml/02-base.yml
index 0f3f013fb..2841f2739 100644
--- a/tests/dictionaries/80variable_accent/yml/02-base.yml
+++ b/tests/dictionaries/80variable_accent/yml/02-base.yml
@@ -1,10 +1,10 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
variables:
- variable:
- name: mode_conteneur_actif2
+ - name: mode_conteneur_actif2
type: string
description: No change
hidden: true
diff --git a/tests/dictionaries/80variable_extra/yml/00-base.yml b/tests/dictionaries/80variable_extra/yml/00-base.yml
index 7bfc8eb5a..b55833699 100644
--- a/tests/dictionaries/80variable_extra/yml/00-base.yml
+++ b/tests/dictionaries/80variable_extra/yml/00-base.yml
@@ -1,4 +1,4 @@
version: '0.10'
variables:
- variable:
- name: extra
+ - name: extra
diff --git a/tests/dictionaries/80variable_extra/yml/extra_dirs/extra/00-base.yml b/tests/dictionaries/80variable_extra/yml/extra_dirs/extra/00-base.yml
index 8c04b5f98..4a844620f 100644
--- a/tests/dictionaries/80variable_extra/yml/extra_dirs/extra/00-base.yml
+++ b/tests/dictionaries/80variable_extra/yml/extra_dirs/extra/00-base.yml
@@ -1,4 +1,4 @@
version: '0.10'
variables:
- variable:
- name: day
+ - name: day
diff --git a/tests/dictionaries/80variable_family_not_same_name/yml/00-base.yml b/tests/dictionaries/80variable_family_not_same_name/yml/00-base.yml
index cae7d610b..a935eb2ca 100644
--- a/tests/dictionaries/80variable_family_not_same_name/yml/00-base.yml
+++ b/tests/dictionaries/80variable_family_not_same_name/yml/00-base.yml
@@ -1,9 +1,9 @@
version: '0.10'
variables:
- variable:
- name: general
+ - name: general
- family:
- name: general
+ - name: general
variables:
- variable:
- name: my_variable2
+ - name: my_variable2
diff --git a/tests/dictionaries/80variable_rougail/yml/00-base.yml b/tests/dictionaries/80variable_rougail/yml/00-base.yml
index 7c0cf059c..4ab3bad99 100644
--- a/tests/dictionaries/80variable_rougail/yml/00-base.yml
+++ b/tests/dictionaries/80variable_rougail/yml/00-base.yml
@@ -1,4 +1,4 @@
version: '0.10'
variables:
- variable:
- name: rougail
+ - name: rougail
diff --git a/tests/dictionaries/80variable_up/yml/00-base.yml b/tests/dictionaries/80variable_up/yml/00-base.yml
index feb3210ed..fd072e56d 100644
--- a/tests/dictionaries/80variable_up/yml/00-base.yml
+++ b/tests/dictionaries/80variable_up/yml/00-base.yml
@@ -1,19 +1,18 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
variables:
- variable:
- name: variableAccent
+ - name: variableAccent
type: string
description: No change
value:
- text: non
-- family:
- name: Other
+ - name: Other
variables:
- variable:
- name: mode_conteneur_actif3
+ - name: mode_conteneur_actif3
type: string
description: No change
hidden: true
diff --git a/tests/dictionaries/81extra_externalspace/yml/00-base.yml b/tests/dictionaries/81extra_externalspace/yml/00-base.yml
index 4c3aab0db..5dac3936a 100644
--- a/tests/dictionaries/81extra_externalspace/yml/00-base.yml
+++ b/tests/dictionaries/81extra_externalspace/yml/00-base.yml
@@ -1,10 +1,10 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
variables:
- variable:
- name: activer_ejabberd
+ - name: activer_ejabberd
type: string
description: No change
hidden: true
diff --git a/tests/dictionaries/81extra_externalspace/yml/extra_dirs/extra/00-base.yml b/tests/dictionaries/81extra_externalspace/yml/extra_dirs/extra/00-base.yml
index 61462b062..6722541d2 100644
--- a/tests/dictionaries/81extra_externalspace/yml/extra_dirs/extra/00-base.yml
+++ b/tests/dictionaries/81extra_externalspace/yml/extra_dirs/extra/00-base.yml
@@ -1,15 +1,14 @@
version: '0.10'
variables:
- family:
- name: ejabberd
+ - name: ejabberd
variables:
- variable:
- name: description
+ - name: description
type: string
value:
- text: Exportation de la base de ejabberd
- - variable:
- name: day
+ - name: day
type: choice
mandatory: true
choice:
@@ -19,8 +18,7 @@ variables:
- text: monthly
value:
- text: none
- - variable:
- name: mode
+ - name: mode
type: choice
mandatory: true
value:
diff --git a/tests/dictionaries/81extra_externalspace/yml/extra_dirs/extra1/00-base.yml b/tests/dictionaries/81extra_externalspace/yml/extra_dirs/extra1/00-base.yml
index 1ba1de6fe..e5a7ca440 100644
--- a/tests/dictionaries/81extra_externalspace/yml/extra_dirs/extra1/00-base.yml
+++ b/tests/dictionaries/81extra_externalspace/yml/extra_dirs/extra1/00-base.yml
@@ -1,10 +1,10 @@
version: '0.10'
variables:
- family:
- name: external
+ - name: external
variables:
- variable:
- name: description
+ - name: description
type: string
value:
- text: test
diff --git a/tests/dictionaries/88remove_choice_not_choice/yml/00-base.yml b/tests/dictionaries/88remove_choice_not_choice/yml/00-base.yml
index 57b33689a..7529b5db1 100644
--- a/tests/dictionaries/88remove_choice_not_choice/yml/00-base.yml
+++ b/tests/dictionaries/88remove_choice_not_choice/yml/00-base.yml
@@ -1,5 +1,5 @@
version: '0.10'
variables:
- variable:
- name: enumvar
+ - name: enumvar
type: string
diff --git a/tests/dictionaries/88remove_choice_not_choice/yml/01-base.yml b/tests/dictionaries/88remove_choice_not_choice/yml/01-base.yml
index 5bd79ac8b..f609e8538 100644
--- a/tests/dictionaries/88remove_choice_not_choice/yml/01-base.yml
+++ b/tests/dictionaries/88remove_choice_not_choice/yml/01-base.yml
@@ -1,6 +1,6 @@
version: '0.10'
variables:
- variable:
- name: enumvar
+ - name: enumvar
redefine: true
remove_choice: true
diff --git a/tests/dictionaries/88valid_enum_invalid_default/yml/00-base.yml b/tests/dictionaries/88valid_enum_invalid_default/yml/00-base.yml
index cf517fc79..9d4549548 100644
--- a/tests/dictionaries/88valid_enum_invalid_default/yml/00-base.yml
+++ b/tests/dictionaries/88valid_enum_invalid_default/yml/00-base.yml
@@ -1,21 +1,20 @@
version: '0.10'
variables:
- family:
- name: general
+ - name: general
mode: expert
variables:
- variable:
- name: mode_conteneur_actif
+ - name: mode_conteneur_actif
type: string
description: No change
value:
- text: non
-- family:
- name: enumfam
+ - name: enumfam
mode: expert
variables:
- variable:
- name: enumvar
+ - name: enumvar
type: choice
description: enumvar
value:
diff --git a/tests/dictionaries_old/01base_file/00-base.xml b/tests/dictionaries_old/01base_file/00-base.xml
index 2bc1f68d4..9f2dbf082 100644
--- a/tests/dictionaries_old/01base_file/00-base.xml
+++ b/tests/dictionaries_old/01base_file/00-base.xml
@@ -3,7 +3,7 @@
/etc/file
- /etc/file2
+ /etc/file2
diff --git a/tests/dictionaries_old/01base_file/tiramisu/base.py b/tests/dictionaries_old/01base_file/tiramisu/base.py
index 5cceee7be..5ffe02b0b 100644
--- a/tests/dictionaries_old/01base_file/tiramisu/base.py
+++ b/tests/dictionaries_old/01base_file/tiramisu/base.py
@@ -21,7 +21,7 @@ option_7.impl_set_information('source', "file")
option_11 = FilenameOption(name="name", doc="name", default="/etc/file2")
option_12 = BoolOption(name="activate", doc="activate", default=True)
option_10 = OptionDescription(name="file2", doc="file2", children=[option_11, option_12])
-option_10.impl_set_information('engine', "jinja2")
+option_10.impl_set_information('engine', "jinja")
option_10.impl_set_information('source', "file2")
option_6 = OptionDescription(name="files", doc="files", children=[option_7, option_10])
option_13 = BoolOption(name="activate", doc="activate", default=True)
diff --git a/tests/dictionaries_old/01base_file_include/00-base.xml b/tests/dictionaries_old/01base_file_include/00-base.xml
index 2bc1f68d4..9f2dbf082 100644
--- a/tests/dictionaries_old/01base_file_include/00-base.xml
+++ b/tests/dictionaries_old/01base_file_include/00-base.xml
@@ -3,7 +3,7 @@
/etc/file
- /etc/file2
+ /etc/file2
diff --git a/tests/dictionaries_old/01base_file_include/tiramisu/base.py b/tests/dictionaries_old/01base_file_include/tiramisu/base.py
index 5cceee7be..5ffe02b0b 100644
--- a/tests/dictionaries_old/01base_file_include/tiramisu/base.py
+++ b/tests/dictionaries_old/01base_file_include/tiramisu/base.py
@@ -21,7 +21,7 @@ option_7.impl_set_information('source', "file")
option_11 = FilenameOption(name="name", doc="name", default="/etc/file2")
option_12 = BoolOption(name="activate", doc="activate", default=True)
option_10 = OptionDescription(name="file2", doc="file2", children=[option_11, option_12])
-option_10.impl_set_information('engine', "jinja2")
+option_10.impl_set_information('engine', "jinja")
option_10.impl_set_information('source', "file2")
option_6 = OptionDescription(name="files", doc="files", children=[option_7, option_10])
option_13 = BoolOption(name="activate", doc="activate", default=True)
diff --git a/tests/dictionaries_old/01base_file_include_content/00-base.xml b/tests/dictionaries_old/01base_file_include_content/00-base.xml
index 6632ee174..ef7b6bd58 100644
--- a/tests/dictionaries_old/01base_file_include_content/00-base.xml
+++ b/tests/dictionaries_old/01base_file_include_content/00-base.xml
@@ -3,7 +3,7 @@
/etc/file
- /etc/file2
+ /etc/file2
/etc/dir/incfile
diff --git a/tests/dictionaries_old/01base_file_include_content/tiramisu/base.py b/tests/dictionaries_old/01base_file_include_content/tiramisu/base.py
index f1fd9d2cf..d24979860 100644
--- a/tests/dictionaries_old/01base_file_include_content/tiramisu/base.py
+++ b/tests/dictionaries_old/01base_file_include_content/tiramisu/base.py
@@ -21,7 +21,7 @@ option_7.impl_set_information('source', "file")
option_11 = FilenameOption(name="name", doc="name", default="/etc/file2")
option_12 = BoolOption(name="activate", doc="activate", default=True)
option_10 = OptionDescription(name="file2", doc="file2", children=[option_11, option_12])
-option_10.impl_set_information('engine', "jinja2")
+option_10.impl_set_information('engine', "jinja")
option_10.impl_set_information('source', "file2")
option_14 = FilenameOption(name="name", doc="name", default="/etc/dir/incfile")
option_15 = BoolOption(name="activate", doc="activate", default=True)
diff --git a/tests/dictionaries_old/01base_file_include_name/00-base.xml b/tests/dictionaries_old/01base_file_include_name/00-base.xml
index eff8650e1..70a5a3f74 100644
--- a/tests/dictionaries_old/01base_file_include_name/00-base.xml
+++ b/tests/dictionaries_old/01base_file_include_name/00-base.xml
@@ -3,7 +3,7 @@
/etc/file
- /etc/file2
+ /etc/file2
/etc/dir/incfile
diff --git a/tests/dictionaries_old/01base_file_include_name/tiramisu/base.py b/tests/dictionaries_old/01base_file_include_name/tiramisu/base.py
index b8c816a33..6b8534b3b 100644
--- a/tests/dictionaries_old/01base_file_include_name/tiramisu/base.py
+++ b/tests/dictionaries_old/01base_file_include_name/tiramisu/base.py
@@ -21,7 +21,7 @@ option_7.impl_set_information('source', "file")
option_11 = FilenameOption(name="name", doc="name", default="/etc/file2")
option_12 = BoolOption(name="activate", doc="activate", default=True)
option_10 = OptionDescription(name="file2", doc="file2", children=[option_11, option_12])
-option_10.impl_set_information('engine', "jinja2")
+option_10.impl_set_information('engine', "jinja")
option_10.impl_set_information('source', "file2")
option_14 = FilenameOption(name="name", doc="name", default="/etc/dir/incfile")
option_15 = BoolOption(name="activate", doc="activate", default=True)
diff --git a/tests/dictionaries_old/01base_file_patch/00-base.xml b/tests/dictionaries_old/01base_file_patch/00-base.xml
index 2bc1f68d4..9f2dbf082 100644
--- a/tests/dictionaries_old/01base_file_patch/00-base.xml
+++ b/tests/dictionaries_old/01base_file_patch/00-base.xml
@@ -3,7 +3,7 @@
/etc/file
- /etc/file2
+ /etc/file2
diff --git a/tests/dictionaries_old/01base_file_patch/tiramisu/base.py b/tests/dictionaries_old/01base_file_patch/tiramisu/base.py
index 5cceee7be..5ffe02b0b 100644
--- a/tests/dictionaries_old/01base_file_patch/tiramisu/base.py
+++ b/tests/dictionaries_old/01base_file_patch/tiramisu/base.py
@@ -21,7 +21,7 @@ option_7.impl_set_information('source', "file")
option_11 = FilenameOption(name="name", doc="name", default="/etc/file2")
option_12 = BoolOption(name="activate", doc="activate", default=True)
option_10 = OptionDescription(name="file2", doc="file2", children=[option_11, option_12])
-option_10.impl_set_information('engine', "jinja2")
+option_10.impl_set_information('engine', "jinja")
option_10.impl_set_information('source', "file2")
option_6 = OptionDescription(name="files", doc="files", children=[option_7, option_10])
option_13 = BoolOption(name="activate", doc="activate", default=True)
diff --git a/tests/dictionaries_old/01base_file_utfchar/00-base.xml b/tests/dictionaries_old/01base_file_utfchar/00-base.xml
index 5954ca3bc..9d943bdbc 100644
--- a/tests/dictionaries_old/01base_file_utfchar/00-base.xml
+++ b/tests/dictionaries_old/01base_file_utfchar/00-base.xml
@@ -3,7 +3,7 @@
/etc/systemd-makefs@dev-disk-by\x2dpartlabel
- /etc/systemd-makefs@dev-disk-by\x2dpartlabel2
+ /etc/systemd-makefs@dev-disk-by\x2dpartlabel2
diff --git a/tests/dictionaries_old/01base_file_utfchar/tiramisu/base.py b/tests/dictionaries_old/01base_file_utfchar/tiramisu/base.py
index efd63225c..c379539ee 100644
--- a/tests/dictionaries_old/01base_file_utfchar/tiramisu/base.py
+++ b/tests/dictionaries_old/01base_file_utfchar/tiramisu/base.py
@@ -21,7 +21,7 @@ option_7.impl_set_information('source', "systemd-makefs@dev-disk-by\\x2dpartlabe
option_11 = FilenameOption(name="name", doc="name", default="/etc/systemd-makefs@dev-disk-by\\x2dpartlabel2")
option_12 = BoolOption(name="activate", doc="activate", default=True)
option_10 = OptionDescription(name="systemd_makefs@dev_disk_by\\x2dpartlabel2", doc="systemd-makefs@dev-disk-by\\x2dpartlabel2", children=[option_11, option_12])
-option_10.impl_set_information('engine', "jinja2")
+option_10.impl_set_information('engine', "jinja")
option_10.impl_set_information('source', "systemd-makefs@dev-disk-by\\x2dpartlabel2")
option_6 = OptionDescription(name="files", doc="files", children=[option_7, option_10])
option_13 = BoolOption(name="activate", doc="activate", default=True)
diff --git a/tests/dictionaries_old/20override/00-base.xml b/tests/dictionaries_old/20override/00-base.xml
index 3b380b576..8b81ae035 100644
--- a/tests/dictionaries_old/20override/00-base.xml
+++ b/tests/dictionaries_old/20override/00-base.xml
@@ -5,7 +5,7 @@
-
+
diff --git a/tests/dictionaries_old/20override/tiramisu/base.py b/tests/dictionaries_old/20override/tiramisu/base.py
index 81d62f492..5305d9658 100644
--- a/tests/dictionaries_old/20override/tiramisu/base.py
+++ b/tests/dictionaries_old/20override/tiramisu/base.py
@@ -24,7 +24,7 @@ option_10 = BoolOption(name="manage", doc="manage", default=True)
option_5 = OptionDescription(name="test", doc="test", children=[option_6, option_9, option_10])
option_14 = BoolOption(name="activate", doc="activate", default=True)
option_13 = OptionDescription(name="test2_service", doc="test2.service", children=[option_14])
-option_13.impl_set_information('engine', "jinja2")
+option_13.impl_set_information('engine', "jinja")
option_13.impl_set_information('name', "test2")
option_13.impl_set_information('source', "test2.service")
option_12 = OptionDescription(name="overrides", doc="overrides", children=[option_13])
diff --git a/tests/dictionaries_old/40ifin_leadershipauto_follower/00-base.xml b/tests/dictionaries_old/40ifin_leadershipauto_follower/00-base.xml
index 5de130d6c..305669267 100644
--- a/tests/dictionaries_old/40ifin_leadershipauto_follower/00-base.xml
+++ b/tests/dictionaries_old/40ifin_leadershipauto_follower/00-base.xml
@@ -3,7 +3,7 @@
/etc/mailname
- /etc/mailname2
+ /etc/mailname2
diff --git a/tests/dictionaries_old/40ifin_leadershipauto_follower/tiramisu/base.py b/tests/dictionaries_old/40ifin_leadershipauto_follower/tiramisu/base.py
index 751a0d069..62405bc0c 100644
--- a/tests/dictionaries_old/40ifin_leadershipauto_follower/tiramisu/base.py
+++ b/tests/dictionaries_old/40ifin_leadershipauto_follower/tiramisu/base.py
@@ -26,7 +26,7 @@ option_12.impl_set_information('source', "mailname")
option_16 = FilenameOption(name="name", doc="name", default="/etc/mailname2")
option_17 = BoolOption(name="activate", doc="activate", default=True)
option_15 = OptionDescription(name="mailname2", doc="mailname2", children=[option_16, option_17])
-option_15.impl_set_information('engine', "jinja2")
+option_15.impl_set_information('engine', "jinja")
option_15.impl_set_information('source', "mailname2")
option_11 = OptionDescription(name="files", doc="files", children=[option_12, option_15])
option_18 = BoolOption(name="activate", doc="activate", default=True)
diff --git a/tests/dictionaries_old/60extra_group/00-base.xml b/tests/dictionaries_old/60extra_group/00-base.xml
index 22be25899..7350eda1c 100644
--- a/tests/dictionaries_old/60extra_group/00-base.xml
+++ b/tests/dictionaries_old/60extra_group/00-base.xml
@@ -3,7 +3,7 @@
/etc/mailname
- /etc/mailname2
+ /etc/mailname2
diff --git a/tests/dictionaries_old/60extra_group/tiramisu/base.py b/tests/dictionaries_old/60extra_group/tiramisu/base.py
index b306fe56a..2de2d215a 100644
--- a/tests/dictionaries_old/60extra_group/tiramisu/base.py
+++ b/tests/dictionaries_old/60extra_group/tiramisu/base.py
@@ -27,7 +27,7 @@ option_13.impl_set_information('source', "mailname")
option_17 = FilenameOption(name="name", doc="name", default="/etc/mailname2")
option_18 = BoolOption(name="activate", doc="activate", default=True)
option_16 = OptionDescription(name="mailname2", doc="mailname2", children=[option_17, option_18])
-option_16.impl_set_information('engine', "jinja2")
+option_16.impl_set_information('engine', "jinja")
option_16.impl_set_information('source', "mailname2")
option_12 = OptionDescription(name="files", doc="files", children=[option_13, option_16])
option_19 = BoolOption(name="activate", doc="activate", default=True)
diff --git a/tests/dictionaries_old/60extra_group_name/00-base.xml b/tests/dictionaries_old/60extra_group_name/00-base.xml
index 22be25899..7350eda1c 100644
--- a/tests/dictionaries_old/60extra_group_name/00-base.xml
+++ b/tests/dictionaries_old/60extra_group_name/00-base.xml
@@ -3,7 +3,7 @@
/etc/mailname
- /etc/mailname2
+ /etc/mailname2
diff --git a/tests/dictionaries_old/60extra_group_name/tiramisu/base.py b/tests/dictionaries_old/60extra_group_name/tiramisu/base.py
index 13ce8ee08..419a165e4 100644
--- a/tests/dictionaries_old/60extra_group_name/tiramisu/base.py
+++ b/tests/dictionaries_old/60extra_group_name/tiramisu/base.py
@@ -27,7 +27,7 @@ option_13.impl_set_information('source', "mailname")
option_17 = FilenameOption(name="name", doc="name", default="/etc/mailname2")
option_18 = BoolOption(name="activate", doc="activate", default=True)
option_16 = OptionDescription(name="mailname2", doc="mailname2", children=[option_17, option_18])
-option_16.impl_set_information('engine', "jinja2")
+option_16.impl_set_information('engine', "jinja")
option_16.impl_set_information('source', "mailname2")
option_12 = OptionDescription(name="files", doc="files", children=[option_13, option_16])
option_19 = BoolOption(name="activate", doc="activate", default=True)
diff --git a/tests/dictionaries_old/70container_files_symlink_multi/00-base.xml b/tests/dictionaries_old/70container_files_symlink_multi/00-base.xml
index 6cdab5227..64cdcb1a3 100644
--- a/tests/dictionaries_old/70container_files_symlink_multi/00-base.xml
+++ b/tests/dictionaries_old/70container_files_symlink_multi/00-base.xml
@@ -3,7 +3,7 @@
file_name
- file_name2
+ file_name2
diff --git a/tests/dictionaries_old/70container_files_symlink_multi/tiramisu/base.py b/tests/dictionaries_old/70container_files_symlink_multi/tiramisu/base.py
index 6202c21a6..1e8a0388d 100644
--- a/tests/dictionaries_old/70container_files_symlink_multi/tiramisu/base.py
+++ b/tests/dictionaries_old/70container_files_symlink_multi/tiramisu/base.py
@@ -21,7 +21,7 @@ option_7.impl_set_information('source', "mailname")
option_11 = SymLinkOption(name="name", opt=option_3)
option_12 = BoolOption(name="activate", doc="activate", default=True)
option_10 = OptionDescription(name="mailname2", doc="mailname2", children=[option_11, option_12])
-option_10.impl_set_information('engine', "jinja2")
+option_10.impl_set_information('engine', "jinja")
option_10.impl_set_information('source', "mailname2")
option_6 = OptionDescription(name="files", doc="files", children=[option_7, option_10])
option_13 = BoolOption(name="activate", doc="activate", default=True)
diff --git a/tests/dictionaries_old/70container_files_symlink_multi_variable/00-base.xml b/tests/dictionaries_old/70container_files_symlink_multi_variable/00-base.xml
index 3270dc101..ea1350515 100644
--- a/tests/dictionaries_old/70container_files_symlink_multi_variable/00-base.xml
+++ b/tests/dictionaries_old/70container_files_symlink_multi_variable/00-base.xml
@@ -3,7 +3,7 @@
file_name
- file_name2
+ file_name2
diff --git a/tests/dictionaries_old/70container_files_symlink_multi_variable/tiramisu/base.py b/tests/dictionaries_old/70container_files_symlink_multi_variable/tiramisu/base.py
index 55a1ffa70..852977224 100644
--- a/tests/dictionaries_old/70container_files_symlink_multi_variable/tiramisu/base.py
+++ b/tests/dictionaries_old/70container_files_symlink_multi_variable/tiramisu/base.py
@@ -24,7 +24,7 @@ option_13 = SymLinkOption(name="name", opt=option_3)
option_14 = SymLinkOption(name="variable", opt=option_4)
option_15 = BoolOption(name="activate", doc="activate", default=True)
option_12 = OptionDescription(name="mailname2", doc="mailname2", children=[option_13, option_14, option_15])
-option_12.impl_set_information('engine', "jinja2")
+option_12.impl_set_information('engine', "jinja")
option_12.impl_set_information('source', "mailname2")
option_7 = OptionDescription(name="files", doc="files", children=[option_8, option_12])
option_16 = BoolOption(name="activate", doc="activate", default=True)
diff --git a/tests/test_1_flattener.py b/tests/test_1_flattener.py
index de8bcbc4e..02a191a51 100644
--- a/tests/test_1_flattener.py
+++ b/tests/test_1_flattener.py
@@ -71,6 +71,7 @@ def xml_to_yaml(filename, destfilename):
if type_ in value:
subvalue = value[type_]
if isinstance(subvalue, list):
+ values = []
for val in subvalue:
if 'variable' in val or 'family' in val:
move_, val = reorganize_variable(val, level + 1)
@@ -81,17 +82,19 @@ def xml_to_yaml(filename, destfilename):
#hack
move = val
else:
- new_value.append({type_: val})
+ values.append(val)
+ if values:
+ new_value.append({type_: values})
else:
if 'variable' in subvalue or 'family' in subvalue:
move_, subvalue = reorganize_variable(subvalue, level + 1)
if move_:
move = move_
- new_value.append({type_: subvalue})
+ new_value.append({type_: [subvalue]})
if level == 0:
return new_value
if level == 1 and move:
- new_value.append({'variable': move})
+ new_value.append({'variable': [move]})
dico = {k: v for k, v in value.items() if k not in ['variable', 'family']}
dico['variables'] = new_value
return move, dico
diff --git a/tests/test_others.py b/tests/test_others.py
index 757690d53..504aca0e1 100644
--- a/tests/test_others.py
+++ b/tests/test_others.py
@@ -40,14 +40,11 @@ def parse_dtd(elt_name, elts, space=0):
return ''
schema = ''
if space:
- if elt_name not in ['variable', 'family']:
- schema += " " * space + "type: seq\n"
- schema += " " * space + "sequence:\n"
- space = space + 2
- schema += " " * space + "- type: map\n"
- space = space + 2
- else:
- schema += " " * space + "type: map\n"
+ schema += " " * space + "type: seq\n"
+ schema += " " * space + "sequence:\n"
+ space = space + 2
+ schema += " " * space + "- type: map\n"
+ space = space + 2
schema += " " * space + "mapping:\n"
if elt_name == 'variables':
# type
@@ -58,7 +55,7 @@ def parse_dtd(elt_name, elts, space=0):
if subspace < 50:
schema += " " * subspace + "family:\n"
schema += parse_dtd('family', elts, subspace + 2)
- subspace = subspace + 4
+ subspace = subspace + 8
schema += " " * subspace + "variables:\n"
schema += parse_dtd(elt_name, elts, subspace + 2)
else: