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

master/slave => leader/follower

This commit is contained in:
Emmanuel Garette 2020-04-18 09:00:03 +02:00
parent 1cd8873e5b
commit 308e980bfd
72 changed files with 399 additions and 399 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/rougail/annotator.py
View File

@ -488,7 +488,7 @@ class SpaceAnnotator(object):
leader_space.path = leader_fullname leader_space.path = leader_fullname
def manage_slave(self, def manage_follower(self,
namespace: str, namespace: str,
leader_family_name: str, leader_family_name: str,
variable: 'Variable', variable: 'Variable',
@ -512,8 +512,8 @@ class SpaceAnnotator(object):
def convert_groups(self): # pylint: disable=C0111 def convert_groups(self): # pylint: disable=C0111
if hasattr(self.space, 'constraints') and hasattr(self.space.constraints, 'group'): if hasattr(self.space, 'constraints') and hasattr(self.space.constraints, 'group'):
for group in self.space.constraints.group: for group in self.space.constraints.group:
leader_fullname = group.master leader_fullname = group.leader
follower_names = list(group.slave.keys()) follower_names = list(group.follower.keys())
leader_family_name = self.paths.get_variable_family_name(leader_fullname) leader_family_name = self.paths.get_variable_family_name(leader_fullname)
namespace = self.paths.get_variable_namespace(leader_fullname) namespace = self.paths.get_variable_namespace(leader_fullname)
leader_name = self.paths.get_variable_name(leader_fullname) leader_name = self.paths.get_variable_name(leader_fullname)
@ -527,8 +527,8 @@ class SpaceAnnotator(object):
has_a_leader = True has_a_leader = True
else: else:
if has_a_leader: if has_a_leader:
# it's a slave # it's a follower
self.manage_slave(namespace, self.manage_follower(namespace,
leader_family_name, leader_family_name,
variable, variable,
leader_name, leader_name,
@ -537,7 +537,7 @@ class SpaceAnnotator(object):
) )
ori_leader_family.variable.pop(variable.name) ori_leader_family.variable.pop(variable.name)
if follower_names == []: if follower_names == []:
# no more slave # no more follower
break break
elif variable.name == leader_name: elif variable.name == leader_name:
# it's a leader # it's a leader

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

@ -13,7 +13,7 @@
# Forked by: # Forked by:
# Cadoles (http://www.cadoles.com) # Cadoles (http://www.cadoles.com)
# Copyright (C) 2019 # Copyright (C) 2019-2020
# distribued with GPL-2 or later license # distribued with GPL-2 or later license
@ -172,8 +172,8 @@
<!ATTLIST condition source CDATA #REQUIRED> <!ATTLIST condition source CDATA #REQUIRED>
<!ATTLIST condition fallback (True|False) "False"> <!ATTLIST condition fallback (True|False) "False">
<!ELEMENT group (slave+)> <!ELEMENT group (follower+)>
<!ATTLIST group master CDATA #REQUIRED> <!ATTLIST group leader CDATA #REQUIRED>
<!ATTLIST group description CDATA #IMPLIED> <!ATTLIST group description CDATA #IMPLIED>
<!ELEMENT param (#PCDATA)> <!ELEMENT param (#PCDATA)>
@ -186,6 +186,6 @@
<!ATTLIST target type (family|variable|filelist|iplist|portlist|tcpwrapperlist|packagelist|actionlist) "variable"> <!ATTLIST target type (family|variable|filelist|iplist|portlist|tcpwrapperlist|packagelist|actionlist) "variable">
<!ATTLIST target optional (True|False) "False"> <!ATTLIST target optional (True|False) "False">
<!ELEMENT slave (#PCDATA)> <!ELEMENT follower (#PCDATA)>
<!ELEMENT help ((variable* | family*)*)> <!ELEMENT help ((variable* | family*)*)>

4
src/rougail/objspace.py
View File

@ -34,8 +34,8 @@ from .annotator import ERASED_ATTRIBUTES, ActionAnnotator, ServiceAnnotator, Spa
from .utils import normalize_family from .utils import normalize_family
from .error import CreoleOperationError, SpaceObjShallNotBeUpdated, CreoleDictConsistencyError from .error import CreoleOperationError, SpaceObjShallNotBeUpdated, CreoleDictConsistencyError
# CreoleObjSpace's elements like 'family' or 'slave', that shall be forced to the Redefinable type # CreoleObjSpace's elements like 'family' or 'follower', that shall be forced to the Redefinable type
FORCE_REDEFINABLES = ('family', 'slave', 'service', 'disknod', 'variables', 'family_action') FORCE_REDEFINABLES = ('family', 'follower', 'service', 'disknod', 'variables', 'family_action')
# CreoleObjSpace's elements that shall be forced to the UnRedefinable type # CreoleObjSpace's elements that shall be forced to the UnRedefinable type
FORCE_UNREDEFINABLES = ('value', 'input', 'profile', 'ewtapp', 'tag', 'saltaction') FORCE_UNREDEFINABLES = ('value', 'input', 'profile', 'ewtapp', 'tag', 'saltaction')
# CreoleObjSpace's elements that shall be set to the UnRedefinable type # CreoleObjSpace's elements that shall be set to the UnRedefinable type

54
src/rougail/template.py
View File

@ -59,11 +59,11 @@ class IsDefined:
if '.' in varname: if '.' in varname:
splitted_var = varname.split('.') splitted_var = varname.split('.')
if len(splitted_var) != 2: if len(splitted_var) != 2:
msg = _("Group variables must be of type master.slave") msg = _("Group variables must be of type leader.follower")
raise KeyError(msg) raise KeyError(msg)
master, slave = splitted_var leader, follower = splitted_var
if master in self.context: if leader in self.context:
return slave in self.context[master].slave.keys() return follower in self.context[leader].follower.keys()
return False return False
else: else:
return varname in self.context return varname in self.context
@ -133,7 +133,7 @@ class CheetahTemplate(ChtTemplate):
class CreoleLeader: class CreoleLeader:
def __init__(self, value, slave=None, index=None): def __init__(self, value, follower=None, index=None):
""" """
On rend la variable itérable pour pouvoir faire: On rend la variable itérable pour pouvoir faire:
for ip in iplist: for ip in iplist:
@ -143,20 +143,20 @@ class CreoleLeader:
index is used for CreoleLint index is used for CreoleLint
""" """
self._value = value self._value = value
if slave is not None: if follower is not None:
self.slave = slave self.follower = follower
else: else:
self.slave = {} self.follower = {}
self._index = index self._index = index
def __getattr__(self, name): def __getattr__(self, name):
"""Get slave variable or attribute of master value. """Get follower variable or attribute of leader value.
If the attribute is a name of a slave variable, return its value. If the attribute is a name of a follower variable, return its value.
Otherwise, returns the requested attribute of master value. Otherwise, returns the requested attribute of leader value.
""" """
if name in self.slave: if name in self.follower:
value = self.slave[name] value = self.follower[name]
if isinstance(value, PropertiesOptionError): if isinstance(value, PropertiesOptionError):
raise AttributeError() raise AttributeError()
return value return value
@ -164,36 +164,36 @@ class CreoleLeader:
return getattr(self._value, name) return getattr(self._value, name)
def __getitem__(self, index): def __getitem__(self, index):
"""Get a master.slave at requested index. """Get a leader.follower at requested index.
""" """
ret = {} ret = {}
for key, values in self.slave.items(): for key, values in self.follower.items():
ret[key] = values[index] ret[key] = values[index]
return CreoleLeader(self._value[index], ret, index) return CreoleLeader(self._value[index], ret, index)
def __iter__(self): def __iter__(self):
"""Iterate over master.slave. """Iterate over leader.follower.
Return synchronised value of master.slave. Return synchronised value of leader.follower.
""" """
for i in range(len(self._value)): for i in range(len(self._value)):
ret = {} ret = {}
for key, values in self.slave.items(): for key, values in self.follower.items():
ret[key] = values[i] ret[key] = values[i]
yield CreoleLeader(self._value[i], ret, i) yield CreoleLeader(self._value[i], ret, i)
def __len__(self): def __len__(self):
"""Delegate to master value """Delegate to leader value
""" """
return len(self._value) return len(self._value)
def __repr__(self): def __repr__(self):
"""Show CreoleLeader as dictionary. """Show CreoleLeader as dictionary.
The master value is stored under 'value' key. The leader value is stored under 'value' key.
The slaves are stored under 'slave' key. The followers are stored under 'follower' key.
""" """
return repr({'value': self._value, 'slave': self.slave}) return repr({'value': self._value, 'follower': self.follower})
def __eq__(self, value): def __eq__(self, value):
return value == self._value return value == self._value
@ -214,7 +214,7 @@ class CreoleLeader:
return self._value >= value return self._value >= value
def __str__(self): def __str__(self):
"""Delegate to master value """Delegate to leader value
""" """
return str(self._value) return str(self._value)
@ -227,7 +227,7 @@ class CreoleLeader:
def __contains__(self, item): def __contains__(self, item):
return item in self._value return item in self._value
async def add_slave(self, config, name, path): async def add_follower(self, config, name, path):
if isinstance(self._value, list): if isinstance(self._value, list):
values = [] values = []
for idx in range(len(self._value)): for idx in range(len(self._value)):
@ -237,7 +237,7 @@ class CreoleLeader:
values.append(err) values.append(err)
else: else:
raise Exception('hu?') raise Exception('hu?')
self.slave[name] = values self.follower[name] = values
class CreoleExtra: class CreoleExtra:
@ -285,7 +285,7 @@ class CreoleTemplateEngine:
leader = CreoleLeader(await suboption.value.get()) leader = CreoleLeader(await suboption.value.get())
self.creole_variables_dict[await suboption.option.name()] = leader self.creole_variables_dict[await suboption.option.name()] = leader
else: else:
await leader.add_slave(self.config, await leader.add_follower(self.config,
await suboption.option.name(), await suboption.option.name(),
await suboption.option.path()) await suboption.option.path())
else: else:
@ -306,7 +306,7 @@ class CreoleTemplateEngine:
leader = CreoleLeader(await suboption.value.get()) leader = CreoleLeader(await suboption.value.get())
leader_name = await suboption.option.name() leader_name = await suboption.option.name()
else: else:
await leader.add_slave(self.config, await leader.add_follower(self.config,
await suboption.option.name(), await suboption.option.name(),
await suboption.option.path()) await suboption.option.path())
variables[leader_name] = leader variables[leader_name] = leader

18
tests/flattener_dicos/10load_masterslaves/00-base.xml
View File

@ -10,22 +10,22 @@
</variable> </variable>
</family> </family>
<family name="general1"> <family name="general1">
<variable name="master" type="string" description="master" multi="True"/> <variable name="leader" type="string" description="leader" multi="True"/>
<variable name="slave1" type="string" description="slave1" multi="True"/> <variable name="follower1" type="string" description="follower1" multi="True"/>
<variable name="slave2" type="string" description="slave2" multi="True"/> <variable name="follower2" type="string" description="follower2" multi="True"/>
</family> </family>
</variables> </variables>
<constraints> <constraints>
<fill name="calc_val" target="slave1"> <fill name="calc_val" target="follower1">
<param name="valeur">valfill</param> <param name="valeur">valfill</param>
</fill> </fill>
<fill name="calc_val" target="slave2"> <fill name="calc_val" target="follower2">
<param type="variable">slave1</param> <param type="variable">follower1</param>
</fill> </fill>
<group master="master"> <group leader="leader">
<slave>slave1</slave> <follower>follower1</follower>
<slave>slave2</slave> <follower>follower2</follower>
</group> </group>
</constraints> </constraints>

2
tests/flattener_dicos/10load_masterslaves/makedict/base.json
View File

@ -1 +1 @@
{"creole.general.mode_conteneur_actif": "non", "creole.general1.master.master": [], "creole.general1.master.slave1": [], "creole.general1.master.slave2": []} {"creole.general.mode_conteneur_actif": "non", "creole.general1.leader.leader": [], "creole.general1.leader.follower1": [], "creole.general1.leader.follower2": []}

10
tests/flattener_dicos/10load_masterslaves/result/00-base.xml
View File

@ -13,19 +13,19 @@
</family> </family>
<family doc="general1" name="general1"> <family doc="general1" name="general1">
<property>normal</property> <property>normal</property>
<leader doc="master" name="master"> <leader doc="leader" name="leader">
<property>normal</property> <property>normal</property>
<variable doc="master" multi="True" name="master" type="string"/> <variable doc="leader" multi="True" name="leader" type="string"/>
<variable doc="slave1" multi="True" name="slave1" type="string"> <variable doc="follower1" multi="True" name="follower1" type="string">
<property>normal</property> <property>normal</property>
<value name="calc_val" type="calculation"> <value name="calc_val" type="calculation">
<param name="valeur" transitive="False" type="string">valfill</param> <param name="valeur" transitive="False" type="string">valfill</param>
</value> </value>
</variable> </variable>
<variable doc="slave2" multi="True" name="slave2" type="string"> <variable doc="follower2" multi="True" name="follower2" type="string">
<property>normal</property> <property>normal</property>
<value name="calc_val" type="calculation"> <value name="calc_val" type="calculation">
<param transitive="False" type="variable">creole.general1.master.slave1</param> <param transitive="False" type="variable">creole.general1.leader.follower1</param>
</value> </value>
</variable> </variable>
</leader> </leader>

14
tests/flattener_dicos/10load_masterslaves_default_multi/00-base.xml
View File

@ -5,21 +5,21 @@
<variables> <variables>
<family name="general"> <family name="general">
<variable name="mode_conteneur_actif" type="oui/non" description="master" multi="True"> <variable name="mode_conteneur_actif" type="oui/non" description="leader" multi="True">
<value>non</value> <value>non</value>
</variable> </variable>
<variable name="master" type="string" description="master" multi="True"/> <variable name="leader" type="string" description="leader" multi="True"/>
<variable name="slave1" type="string" description="slave1" multi="True"> <variable name="follower1" type="string" description="follower1" multi="True">
<value>value</value> <value>value</value>
</variable> </variable>
<variable name="slave2" type="string" description="slave2" multi="True"/> <variable name="follower2" type="string" description="follower2" multi="True"/>
</family> </family>
</variables> </variables>
<constraints> <constraints>
<group master="master"> <group leader="leader">
<slave>slave1</slave> <follower>follower1</follower>
<slave>slave2</slave> <follower>follower2</follower>
</group> </group>
</constraints> </constraints>

2
tests/flattener_dicos/10load_masterslaves_default_multi/makedict/base.json
View File

@ -1 +1 @@
{"creole.general.mode_conteneur_actif": ["non"], "creole.general.master.master": [], "creole.general.master.slave1": [], "creole.general.master.slave2": []} {"creole.general.mode_conteneur_actif": ["non"], "creole.general.leader.leader": [], "creole.general.leader.follower1": [], "creole.general.leader.follower2": []}

10
tests/flattener_dicos/10load_masterslaves_default_multi/result/00-base.xml
View File

@ -3,22 +3,22 @@
<family doc="" name="creole"> <family doc="" name="creole">
<family doc="general" name="general"> <family doc="general" name="general">
<property>normal</property> <property>normal</property>
<variable doc="master" multi="True" name="mode_conteneur_actif" type="choice"> <variable doc="leader" multi="True" name="mode_conteneur_actif" type="choice">
<choice type="string">oui</choice> <choice type="string">oui</choice>
<choice type="string">non</choice> <choice type="string">non</choice>
<property>mandatory</property> <property>mandatory</property>
<property>normal</property> <property>normal</property>
<value type="string">non</value> <value type="string">non</value>
</variable> </variable>
<leader doc="master" name="master"> <leader doc="leader" name="leader">
<property>normal</property> <property>normal</property>
<variable doc="master" multi="True" name="master" type="string"/> <variable doc="leader" multi="True" name="leader" type="string"/>
<variable doc="slave1" multi="True" name="slave1" type="string"> <variable doc="follower1" multi="True" name="follower1" type="string">
<property>mandatory</property> <property>mandatory</property>
<property>normal</property> <property>normal</property>
<value>value</value> <value>value</value>
</variable> </variable>
<variable doc="slave2" multi="True" name="slave2" type="string"> <variable doc="follower2" multi="True" name="follower2" type="string">
<property>normal</property> <property>normal</property>
</variable> </variable>
</leader> </leader>

14
tests/flattener_dicos/10load_masterslaves_defaultmulti_master/00-base.xml
View File

@ -5,21 +5,21 @@
<variables> <variables>
<family name="general"> <family name="general">
<variable name="mode_conteneur_actif" type="oui/non" description="master" multi="True"> <variable name="mode_conteneur_actif" type="oui/non" description="leader" multi="True">
<value>non</value> <value>non</value>
</variable> </variable>
<variable name="master" type="string" description="master" multi="True"> <variable name="leader" type="string" description="leader" multi="True">
<value>value</value> <value>value</value>
</variable> </variable>
<variable name="slave1" type="string" description="slave1" multi="True"/> <variable name="follower1" type="string" description="follower1" multi="True"/>
<variable name="slave2" type="string" description="slave2" multi="True"/> <variable name="follower2" type="string" description="follower2" multi="True"/>
</family> </family>
</variables> </variables>
<constraints> <constraints>
<group master="master"> <group leader="leader">
<slave>slave1</slave> <follower>follower1</follower>
<slave>slave2</slave> <follower>follower2</follower>
</group> </group>
</constraints> </constraints>

2
tests/flattener_dicos/10load_masterslaves_defaultmulti_master/makedict/base.json
View File

@ -1 +1 @@
{"creole.general.mode_conteneur_actif": ["non"], "creole.general.master.master": ["value"], "creole.general.master.slave1": [null], "creole.general.master.slave2": [null]} {"creole.general.mode_conteneur_actif": ["non"], "creole.general.leader.leader": ["value"], "creole.general.leader.follower1": [null], "creole.general.leader.follower2": [null]}

10
tests/flattener_dicos/10load_masterslaves_defaultmulti_master/result/00-base.xml
View File

@ -3,23 +3,23 @@
<family doc="" name="creole"> <family doc="" name="creole">
<family doc="general" name="general"> <family doc="general" name="general">
<property>normal</property> <property>normal</property>
<variable doc="master" multi="True" name="mode_conteneur_actif" type="choice"> <variable doc="leader" multi="True" name="mode_conteneur_actif" type="choice">
<choice type="string">oui</choice> <choice type="string">oui</choice>
<choice type="string">non</choice> <choice type="string">non</choice>
<property>mandatory</property> <property>mandatory</property>
<property>normal</property> <property>normal</property>
<value type="string">non</value> <value type="string">non</value>
</variable> </variable>
<leader doc="master" name="master"> <leader doc="leader" name="leader">
<property>normal</property> <property>normal</property>
<variable doc="master" multi="True" name="master" type="string"> <variable doc="leader" multi="True" name="leader" type="string">
<property>mandatory</property> <property>mandatory</property>
<value>value</value> <value>value</value>
</variable> </variable>
<variable doc="slave1" multi="True" name="slave1" type="string"> <variable doc="follower1" multi="True" name="follower1" type="string">
<property>normal</property> <property>normal</property>
</variable> </variable>
<variable doc="slave2" multi="True" name="slave2" type="string"> <variable doc="follower2" multi="True" name="follower2" type="string">
<property>normal</property> <property>normal</property>
</variable> </variable>
</leader> </leader>

18
tests/flattener_dicos/10load_masterslaves_description/00-base.xml
View File

@ -7,21 +7,21 @@
</variable> </variable>
</family> </family>
<family name='general1'> <family name='general1'>
<variable name='master' type='string' description="master" multi="True"/> <variable name='leader' type='string' description="leader" multi="True"/>
<variable name='slave1' type='string' description="slave1" multi="True"/> <variable name='follower1' type='string' description="follower1" multi="True"/>
<variable name='slave2' type='string' description="slave2" multi="True"/> <variable name='follower2' type='string' description="follower2" multi="True"/>
</family> </family>
</variables> </variables>
<constraints> <constraints>
<fill name='calc_val' target='slave1'> <fill name='calc_val' target='follower1'>
<param name='valeur'>valfill</param> <param name='valeur'>valfill</param>
</fill> </fill>
<fill name='calc_val' target='slave2'> <fill name='calc_val' target='follower2'>
<param type='variable'>slave1</param> <param type='variable'>follower1</param>
</fill> </fill>
<group master='master' description="other description"> <group leader='leader' description="other description">
<slave>slave1</slave> <follower>follower1</follower>
<slave>slave2</slave> <follower>follower2</follower>
</group> </group>
</constraints> </constraints>
</rougail> </rougail>

2
tests/flattener_dicos/10load_masterslaves_description/makedict/base.json
View File

@ -1 +1 @@
{"creole.general.mode_conteneur_actif": "non", "creole.general1.master.master": [], "creole.general1.master.slave1": [], "creole.general1.master.slave2": []} {"creole.general.mode_conteneur_actif": "non", "creole.general1.leader.leader": [], "creole.general1.leader.follower1": [], "creole.general1.leader.follower2": []}

10
tests/flattener_dicos/10load_masterslaves_description/result/00-base.xml
View File

@ -13,19 +13,19 @@
</family> </family>
<family doc="general1" name="general1"> <family doc="general1" name="general1">
<property>normal</property> <property>normal</property>
<leader doc="other description" name="master"> <leader doc="other description" name="leader">
<property>normal</property> <property>normal</property>
<variable doc="master" multi="True" name="master" type="string"/> <variable doc="leader" multi="True" name="leader" type="string"/>
<variable doc="slave1" multi="True" name="slave1" type="string"> <variable doc="follower1" multi="True" name="follower1" type="string">
<property>normal</property> <property>normal</property>
<value name="calc_val" type="calculation"> <value name="calc_val" type="calculation">
<param name="valeur" transitive="False" type="string">valfill</param> <param name="valeur" transitive="False" type="string">valfill</param>
</value> </value>
</variable> </variable>
<variable doc="slave2" multi="True" name="slave2" type="string"> <variable doc="follower2" multi="True" name="follower2" type="string">
<property>normal</property> <property>normal</property>
<value name="calc_val" type="calculation"> <value name="calc_val" type="calculation">
<param transitive="False" type="variable">creole.general1.master.slave1</param> <param transitive="False" type="variable">creole.general1.leader.follower1</param>
</value> </value>
</variable> </variable>
</leader> </leader>

12
tests/flattener_dicos/10load_masterslaves_normalize_family/00-base.xml
View File

@ -10,16 +10,16 @@
</variable> </variable>
</family> </family>
<family name="general-1"> <family name="general-1">
<variable name="master" type="string" description="master" multi="True"/> <variable name="leader" type="string" description="leader" multi="True"/>
<variable name="slave1" type="string" description="slave1" multi="True"/> <variable name="follower1" type="string" description="follower1" multi="True"/>
<variable name="slave2" type="string" description="slave2" multi="True"/> <variable name="follower2" type="string" description="follower2" multi="True"/>
</family> </family>
</variables> </variables>
<constraints> <constraints>
<group master="master"> <group leader="leader">
<slave>slave1</slave> <follower>follower1</follower>
<slave>slave2</slave> <follower>follower2</follower>
</group> </group>
</constraints> </constraints>

2
tests/flattener_dicos/10load_masterslaves_normalize_family/01-base.xml
View File

@ -5,7 +5,7 @@
<variables> <variables>
<family name="general-1"> <family name="general-1">
<variable name="master" redefine="True" mandatory="True"/> <variable name="leader" redefine="True" mandatory="True"/>
</family> </family>
</variables> </variables>

2
tests/flattener_dicos/10load_masterslaves_normalize_family/makedict/base.json
View File

@ -1 +1 @@
{"creole.general.mode_conteneur_actif": "non", "creole.general_1.master.master": [], "creole.general_1.master.slave1": [], "creole.general_1.master.slave2": []} {"creole.general.mode_conteneur_actif": "non", "creole.general_1.leader.leader": [], "creole.general_1.leader.follower1": [], "creole.general_1.leader.follower2": []}

8
tests/flattener_dicos/10load_masterslaves_normalize_family/result/00-base.xml
View File

@ -13,15 +13,15 @@
</family> </family>
<family doc="general-1" name="general_1"> <family doc="general-1" name="general_1">
<property>basic</property> <property>basic</property>
<leader doc="master" name="master"> <leader doc="leader" name="leader">
<property>basic</property> <property>basic</property>
<variable doc="master" multi="True" name="master" type="string"> <variable doc="leader" multi="True" name="leader" type="string">
<property>mandatory</property> <property>mandatory</property>
</variable> </variable>
<variable doc="slave1" multi="True" name="slave1" type="string"> <variable doc="follower1" multi="True" name="follower1" type="string">
<property>normal</property> <property>normal</property>
</variable> </variable>
<variable doc="slave2" multi="True" name="slave2" type="string"> <variable doc="follower2" multi="True" name="follower2" type="string">
<property>normal</property> <property>normal</property>
</variable> </variable>
</leader> </leader>

18
tests/flattener_dicos/10masterslave_autosaveexpert/00-base.xml
View File

@ -8,22 +8,22 @@
<variable name="mode_conteneur_actif" type="oui/non" description="No change"> <variable name="mode_conteneur_actif" type="oui/non" description="No change">
<value>non</value> <value>non</value>
</variable> </variable>
<variable name="master" type="string" description="master" multi="True"/> <variable name="leader" type="string" description="leader" multi="True"/>
<variable name="slave1" type="string" description="slave1" multi="True"/> <variable name="follower1" type="string" description="follower1" multi="True"/>
<variable name="slave2" type="string" description="slave2" multi="True" mode="expert"/> <variable name="follower2" type="string" description="follower2" multi="True" mode="expert"/>
</family> </family>
</variables> </variables>
<constraints> <constraints>
<fill name="calc_val" target="slave1"> <fill name="calc_val" target="follower1">
<param name="valeur">valfill</param> <param name="valeur">valfill</param>
</fill> </fill>
<fill name="calc_val" target="slave2"> <fill name="calc_val" target="follower2">
<param type="variable">slave1</param> <param type="variable">follower1</param>
</fill> </fill>
<group master="master"> <group leader="leader">
<slave>slave1</slave> <follower>follower1</follower>
<slave>slave2</slave> <follower>follower2</follower>
</group> </group>
</constraints> </constraints>

2
tests/flattener_dicos/10masterslave_autosaveexpert/makedict/base.json
View File

@ -1 +1 @@
{"creole.general.mode_conteneur_actif": "non", "creole.general.master.master": [], "creole.general.master.slave1": [], "creole.general.master.slave2": []} {"creole.general.mode_conteneur_actif": "non", "creole.general.leader.leader": [], "creole.general.leader.follower1": [], "creole.general.leader.follower2": []}

10
tests/flattener_dicos/10masterslave_autosaveexpert/result/00-base.xml
View File

@ -10,19 +10,19 @@
<property>normal</property> <property>normal</property>
<value type="string">non</value> <value type="string">non</value>
</variable> </variable>
<leader doc="master" name="master"> <leader doc="leader" name="leader">
<property>normal</property> <property>normal</property>
<variable doc="master" multi="True" name="master" type="string"/> <variable doc="leader" multi="True" name="leader" type="string"/>
<variable doc="slave1" multi="True" name="slave1" type="string"> <variable doc="follower1" multi="True" name="follower1" type="string">
<property>normal</property> <property>normal</property>
<value name="calc_val" type="calculation"> <value name="calc_val" type="calculation">
<param name="valeur" transitive="False" type="string">valfill</param> <param name="valeur" transitive="False" type="string">valfill</param>
</value> </value>
</variable> </variable>
<variable doc="slave2" multi="True" name="slave2" type="string"> <variable doc="follower2" multi="True" name="follower2" type="string">
<property>expert</property> <property>expert</property>
<value name="calc_val" type="calculation"> <value name="calc_val" type="calculation">
<param transitive="False" type="variable">creole.general.master.slave1</param> <param transitive="False" type="variable">creole.general.leader.follower1</param>
</value> </value>
</variable> </variable>
</leader> </leader>

18
tests/flattener_dicos/10masterslave_mandatory/00-base.xml
View File

@ -8,22 +8,22 @@
<variable name="mode_conteneur_actif" type="oui/non" description="No change"> <variable name="mode_conteneur_actif" type="oui/non" description="No change">
<value>non</value> <value>non</value>
</variable> </variable>
<variable name="master" type="string" description="master" multi="True"/> <variable name="leader" type="string" description="leader" multi="True"/>
<variable name="slave1" type="string" description="slave1" multi="True" mandatory="True"/> <variable name="follower1" type="string" description="follower1" multi="True" mandatory="True"/>
<variable name="slave2" type="string" description="slave2" multi="True"/> <variable name="follower2" type="string" description="follower2" multi="True"/>
</family> </family>
</variables> </variables>
<constraints> <constraints>
<fill name="calc_val" target="slave1"> <fill name="calc_val" target="follower1">
<param name="valeur">valfill</param> <param name="valeur">valfill</param>
</fill> </fill>
<fill name="calc_val" target="slave2"> <fill name="calc_val" target="follower2">
<param type="variable">slave1</param> <param type="variable">follower1</param>
</fill> </fill>
<group master="master"> <group leader="leader">
<slave>slave1</slave> <follower>follower1</follower>
<slave>slave2</slave> <follower>follower2</follower>
</group> </group>
</constraints> </constraints>

2
tests/flattener_dicos/10masterslave_mandatory/makedict/base.json
View File

@ -1 +1 @@
{"creole.general.mode_conteneur_actif": "non", "creole.general.master.master": [], "creole.general.master.slave1": [], "creole.general.master.slave2": []} {"creole.general.mode_conteneur_actif": "non", "creole.general.leader.leader": [], "creole.general.leader.follower1": [], "creole.general.leader.follower2": []}

10
tests/flattener_dicos/10masterslave_mandatory/result/00-base.xml
View File

@ -10,20 +10,20 @@
<property>normal</property> <property>normal</property>
<value type="string">non</value> <value type="string">non</value>
</variable> </variable>
<leader doc="master" name="master"> <leader doc="leader" name="leader">
<property>normal</property> <property>normal</property>
<variable doc="master" multi="True" name="master" type="string"/> <variable doc="leader" multi="True" name="leader" type="string"/>
<variable doc="slave1" multi="True" name="slave1" type="string"> <variable doc="follower1" multi="True" name="follower1" type="string">
<property>mandatory</property> <property>mandatory</property>
<property>normal</property> <property>normal</property>
<value name="calc_val" type="calculation"> <value name="calc_val" type="calculation">
<param name="valeur" transitive="False" type="string">valfill</param> <param name="valeur" transitive="False" type="string">valfill</param>
</value> </value>
</variable> </variable>
<variable doc="slave2" multi="True" name="slave2" type="string"> <variable doc="follower2" multi="True" name="follower2" type="string">
<property>normal</property> <property>normal</property>
<value name="calc_val" type="calculation"> <value name="calc_val" type="calculation">
<param transitive="False" type="variable">creole.general.master.slave1</param> <param transitive="False" type="variable">creole.general.leader.follower1</param>
</value> </value>
</variable> </variable>
</leader> </leader>

4
tests/flattener_dicos/10masterslave_mandatoryslave/00-base.xml
View File

@ -13,8 +13,8 @@
</variables> </variables>
<constraints> <constraints>
<group master="nut_monitor_netmask"> <group leader="nut_monitor_netmask">
<slave>nut_monitor_host</slave> <follower>nut_monitor_host</follower>
</group> </group>
</constraints> </constraints>

18
tests/flattener_dicos/10masterslave_mastermandatory/00-base.xml
View File

@ -8,22 +8,22 @@
<variable name="mode_conteneur_actif" type="oui/non" description="No change"> <variable name="mode_conteneur_actif" type="oui/non" description="No change">
<value>non</value> <value>non</value>
</variable> </variable>
<variable name="master" type="string" description="master" multi="True" mandatory="True"/> <variable name="leader" type="string" description="leader" multi="True" mandatory="True"/>
<variable name="slave1" type="string" description="slave1" multi="True"/> <variable name="follower1" type="string" description="follower1" multi="True"/>
<variable name="slave2" type="string" description="slave2" multi="True"/> <variable name="follower2" type="string" description="follower2" multi="True"/>
</family> </family>
</variables> </variables>
<constraints> <constraints>
<fill name="calc_val" target="slave1"> <fill name="calc_val" target="follower1">
<param name="valeur">valfill</param> <param name="valeur">valfill</param>
</fill> </fill>
<fill name="calc_val" target="slave2"> <fill name="calc_val" target="follower2">
<param type="variable">slave1</param> <param type="variable">follower1</param>
</fill> </fill>
<group master="master"> <group leader="leader">
<slave>slave1</slave> <follower>follower1</follower>
<slave>slave2</slave> <follower>follower2</follower>
</group> </group>
</constraints> </constraints>

2
tests/flattener_dicos/10masterslave_mastermandatory/makedict/base.json
View File

@ -1 +1 @@
{"creole.general.mode_conteneur_actif": "non", "creole.general.master.master": [], "creole.general.master.slave1": [], "creole.general.master.slave2": []} {"creole.general.mode_conteneur_actif": "non", "creole.general.leader.leader": [], "creole.general.leader.follower1": [], "creole.general.leader.follower2": []}

10
tests/flattener_dicos/10masterslave_mastermandatory/result/00-base.xml
View File

@ -10,21 +10,21 @@
<property>normal</property> <property>normal</property>
<value type="string">non</value> <value type="string">non</value>
</variable> </variable>
<leader doc="master" name="master"> <leader doc="leader" name="leader">
<property>basic</property> <property>basic</property>
<variable doc="master" multi="True" name="master" type="string"> <variable doc="leader" multi="True" name="leader" type="string">
<property>mandatory</property> <property>mandatory</property>
</variable> </variable>
<variable doc="slave1" multi="True" name="slave1" type="string"> <variable doc="follower1" multi="True" name="follower1" type="string">
<property>normal</property> <property>normal</property>
<value name="calc_val" type="calculation"> <value name="calc_val" type="calculation">
<param name="valeur" transitive="False" type="string">valfill</param> <param name="valeur" transitive="False" type="string">valfill</param>
</value> </value>
</variable> </variable>
<variable doc="slave2" multi="True" name="slave2" type="string"> <variable doc="follower2" multi="True" name="follower2" type="string">
<property>normal</property> <property>normal</property>
<value name="calc_val" type="calculation"> <value name="calc_val" type="calculation">
<param transitive="False" type="variable">creole.general.master.slave1</param> <param transitive="False" type="variable">creole.general.leader.follower1</param>
</value> </value>
</variable> </variable>
</leader> </leader>

30
tests/flattener_dicos/10masterslave_multi/00-base.xml
View File

@ -10,29 +10,29 @@
</variable> </variable>
</family> </family>
<family name="general1"> <family name="general1">
<variable name="master" type="string" description="master" multi="True"/> <variable name="leader" type="string" description="leader" multi="True"/>
<variable name="slave1" type="string" description="slave1" multi="True"/> <variable name="follower1" type="string" description="follower1" multi="True"/>
<variable name="slave2" type="string" description="slave2" multi="True"/> <variable name="follower2" type="string" description="follower2" multi="True"/>
<variable name="master1" type="string" description="master" multi="True"/> <variable name="leader1" type="string" description="leader" multi="True"/>
<variable name="slave11" type="string" description="slave1" multi="True"/> <variable name="follower11" type="string" description="follower1" multi="True"/>
<variable name="slave21" type="string" description="slave2" multi="True"/> <variable name="follower21" type="string" description="follower2" multi="True"/>
</family> </family>
</variables> </variables>
<constraints> <constraints>
<fill name="calc_val" target="slave1"> <fill name="calc_val" target="follower1">
<param name="valeur">valfill</param> <param name="valeur">valfill</param>
</fill> </fill>
<fill name="calc_val" target="slave2"> <fill name="calc_val" target="follower2">
<param type="variable">slave1</param> <param type="variable">follower1</param>
</fill> </fill>
<group master="master"> <group leader="leader">
<slave>slave1</slave> <follower>follower1</follower>
<slave>slave2</slave> <follower>follower2</follower>
</group> </group>
<group master="master1"> <group leader="leader1">
<slave>slave11</slave> <follower>follower11</follower>
<slave>slave21</slave> <follower>follower21</follower>
</group> </group>
</constraints> </constraints>

2
tests/flattener_dicos/10masterslave_multi/makedict/base.json
View File

@ -1 +1 @@
{"creole.general.mode_conteneur_actif": "non", "creole.general1.master.master": [], "creole.general1.master.slave1": [], "creole.general1.master.slave2": [], "creole.general1.master1.master1": [], "creole.general1.master1.slave11": [], "creole.general1.master1.slave21": []} {"creole.general.mode_conteneur_actif": "non", "creole.general1.leader.leader": [], "creole.general1.leader.follower1": [], "creole.general1.leader.follower2": [], "creole.general1.leader1.leader1": [], "creole.general1.leader1.follower11": [], "creole.general1.leader1.follower21": []}

18
tests/flattener_dicos/10masterslave_multi/result/00-base.xml
View File

@ -13,29 +13,29 @@
</family> </family>
<family doc="general1" name="general1"> <family doc="general1" name="general1">
<property>normal</property> <property>normal</property>
<leader doc="master" name="master"> <leader doc="leader" name="leader">
<property>normal</property> <property>normal</property>
<variable doc="master" multi="True" name="master" type="string"/> <variable doc="leader" multi="True" name="leader" type="string"/>
<variable doc="slave1" multi="True" name="slave1" type="string"> <variable doc="follower1" multi="True" name="follower1" type="string">
<property>normal</property> <property>normal</property>
<value name="calc_val" type="calculation"> <value name="calc_val" type="calculation">
<param name="valeur" transitive="False" type="string">valfill</param> <param name="valeur" transitive="False" type="string">valfill</param>
</value> </value>
</variable> </variable>
<variable doc="slave2" multi="True" name="slave2" type="string"> <variable doc="follower2" multi="True" name="follower2" type="string">
<property>normal</property> <property>normal</property>
<value name="calc_val" type="calculation"> <value name="calc_val" type="calculation">
<param transitive="False" type="variable">creole.general1.master.slave1</param> <param transitive="False" type="variable">creole.general1.leader.follower1</param>
</value> </value>
</variable> </variable>
</leader> </leader>
<leader doc="master" name="master1"> <leader doc="leader" name="leader1">
<property>normal</property> <property>normal</property>
<variable doc="master" multi="True" name="master1" type="string"/> <variable doc="leader" multi="True" name="leader1" type="string"/>
<variable doc="slave1" multi="True" name="slave11" type="string"> <variable doc="follower1" multi="True" name="follower11" type="string">
<property>normal</property> <property>normal</property>
</variable> </variable>
<variable doc="slave2" multi="True" name="slave21" type="string"> <variable doc="follower2" multi="True" name="follower21" type="string">
<property>normal</property> <property>normal</property>
</variable> </variable>
</leader> </leader>

18
tests/flattener_dicos/10masterslaves_append/00-base.xml
View File

@ -10,22 +10,22 @@
</variable> </variable>
</family> </family>
<family name="general1"> <family name="general1">
<variable name="master" type="string" description="master" multi="True"/> <variable name="leader" type="string" description="leader" multi="True"/>
<variable name="slave1" type="string" description="slave1" multi="True"/> <variable name="follower1" type="string" description="follower1" multi="True"/>
<variable name="slave2" type="string" description="slave2" multi="True"/> <variable name="follower2" type="string" description="follower2" multi="True"/>
</family> </family>
</variables> </variables>
<constraints> <constraints>
<fill name="calc_val" target="slave1"> <fill name="calc_val" target="follower1">
<param name="valeur">valfill</param> <param name="valeur">valfill</param>
</fill> </fill>
<fill name="calc_val" target="slave2"> <fill name="calc_val" target="follower2">
<param type="variable">slave1</param> <param type="variable">follower1</param>
</fill> </fill>
<group master="master"> <group leader="leader">
<slave>slave1</slave> <follower>follower1</follower>
<slave>slave2</slave> <follower>follower2</follower>
</group> </group>
</constraints> </constraints>

6
tests/flattener_dicos/10masterslaves_append/01-base.xml
View File

@ -5,13 +5,13 @@
<variables> <variables>
<family name="general1"> <family name="general1">
<variable name="slave3" type="string" description="slave3" multi="True"/> <variable name="follower3" type="string" description="follower3" multi="True"/>
</family> </family>
</variables> </variables>
<constraints> <constraints>
<group master="master"> <group leader="leader">
<slave>slave3</slave> <follower>follower3</follower>
</group> </group>
</constraints> </constraints>

2
tests/flattener_dicos/10masterslaves_append/makedict/base.json
View File

@ -1 +1 @@
{"creole.general.mode_conteneur_actif": "non", "creole.general1.master.master": [], "creole.general1.master.slave1": [], "creole.general1.master.slave2": [], "creole.general1.master.slave3": []} {"creole.general.mode_conteneur_actif": "non", "creole.general1.leader.leader": [], "creole.general1.leader.follower1": [], "creole.general1.leader.follower2": [], "creole.general1.leader.follower3": []}

12
tests/flattener_dicos/10masterslaves_append/result/00-base.xml
View File

@ -13,22 +13,22 @@
</family> </family>
<family doc="general1" name="general1"> <family doc="general1" name="general1">
<property>normal</property> <property>normal</property>
<leader doc="master" name="master"> <leader doc="leader" name="leader">
<property>normal</property> <property>normal</property>
<variable doc="master" multi="True" name="master" type="string"/> <variable doc="leader" multi="True" name="leader" type="string"/>
<variable doc="slave1" multi="True" name="slave1" type="string"> <variable doc="follower1" multi="True" name="follower1" type="string">
<property>normal</property> <property>normal</property>
<value name="calc_val" type="calculation"> <value name="calc_val" type="calculation">
<param name="valeur" transitive="False" type="string">valfill</param> <param name="valeur" transitive="False" type="string">valfill</param>
</value> </value>
</variable> </variable>
<variable doc="slave2" multi="True" name="slave2" type="string"> <variable doc="follower2" multi="True" name="follower2" type="string">
<property>normal</property> <property>normal</property>
<value name="calc_val" type="calculation"> <value name="calc_val" type="calculation">
<param transitive="False" type="variable">creole.general1.master.slave1</param> <param transitive="False" type="variable">creole.general1.leader.follower1</param>
</value> </value>
</variable> </variable>
<variable doc="slave3" multi="True" name="slave3" type="string"> <variable doc="follower3" multi="True" name="follower3" type="string">
<property>normal</property> <property>normal</property>
</variable> </variable>
</leader> </leader>

26
tests/flattener_dicos/10masterslaves_auto/00-base.xml
View File

@ -8,27 +8,27 @@
<variable name="mode_conteneur_actif" type="oui/non" description="No change"> <variable name="mode_conteneur_actif" type="oui/non" description="No change">
<value>non</value> <value>non</value>
</variable> </variable>
<variable name="master" type="string" description="master" multi="True"/> <variable name="leader" type="string" description="leader" multi="True"/>
<variable name="slave1" type="string" description="slave1" multi="True"/> <variable name="follower1" type="string" description="follower1" multi="True"/>
<variable name="slave2" type="string" description="slave2" multi="True"/> <variable name="follower2" type="string" description="follower2" multi="True"/>
<variable name="slave3" type="string" description="slave3" multi="True"/> <variable name="follower3" type="string" description="follower3" multi="True"/>
</family> </family>
</variables> </variables>
<constraints> <constraints>
<auto name="calc_val" target="slave1"> <auto name="calc_val" target="follower1">
<param name="valeur">valfill</param> <param name="valeur">valfill</param>
</auto> </auto>
<auto name="calc_val" target="slave2"> <auto name="calc_val" target="follower2">
<param type="variable">slave1</param> <param type="variable">follower1</param>
</auto> </auto>
<auto name="calc_val" target="slave3"> <auto name="calc_val" target="follower3">
<param type="variable">master</param> <param type="variable">leader</param>
</auto> </auto>
<group master="master"> <group leader="leader">
<slave>slave1</slave> <follower>follower1</follower>
<slave>slave2</slave> <follower>follower2</follower>
<slave>slave3</slave> <follower>follower3</follower>
</group> </group>
</constraints> </constraints>

2
tests/flattener_dicos/10masterslaves_auto/makedict/base.json
View File

@ -1 +1 @@
{"creole.general.mode_conteneur_actif": "non", "creole.general.master.master": []} {"creole.general.mode_conteneur_actif": "non", "creole.general.leader.leader": []}

14
tests/flattener_dicos/10masterslaves_auto/result/00-base.xml
View File

@ -10,10 +10,10 @@
<property>normal</property> <property>normal</property>
<value type="string">non</value> <value type="string">non</value>
</variable> </variable>
<leader doc="master" name="master"> <leader doc="leader" name="leader">
<property>normal</property> <property>normal</property>
<variable doc="master" multi="True" name="master" type="string"/> <variable doc="leader" multi="True" name="leader" type="string"/>
<variable doc="slave1" multi="True" name="slave1" type="string"> <variable doc="follower1" multi="True" name="follower1" type="string">
<property>force_default_on_freeze</property> <property>force_default_on_freeze</property>
<property>frozen</property> <property>frozen</property>
<property>hidden</property> <property>hidden</property>
@ -22,22 +22,22 @@
<param name="valeur" transitive="False" type="string">valfill</param> <param name="valeur" transitive="False" type="string">valfill</param>
</value> </value>
</variable> </variable>
<variable doc="slave2" multi="True" name="slave2" type="string"> <variable doc="follower2" multi="True" name="follower2" type="string">
<property>force_default_on_freeze</property> <property>force_default_on_freeze</property>
<property>frozen</property> <property>frozen</property>
<property>hidden</property> <property>hidden</property>
<property>normal</property> <property>normal</property>
<value name="calc_val" type="calculation"> <value name="calc_val" type="calculation">
<param transitive="False" type="variable">creole.general.master.slave1</param> <param transitive="False" type="variable">creole.general.leader.follower1</param>
</value> </value>
</variable> </variable>
<variable doc="slave3" multi="True" name="slave3" type="string"> <variable doc="follower3" multi="True" name="follower3" type="string">
<property>force_default_on_freeze</property> <property>force_default_on_freeze</property>
<property>frozen</property> <property>frozen</property>
<property>hidden</property> <property>hidden</property>
<property>normal</property> <property>normal</property>
<value name="calc_val" type="calculation"> <value name="calc_val" type="calculation">
<param transitive="False" type="variable">creole.general.master.master</param> <param transitive="False" type="variable">creole.general.leader.leader</param>
</value> </value>
</variable> </variable>
</leader> </leader>

18
tests/flattener_dicos/10masterslaves_automaster/00-base.xml
View File

@ -8,22 +8,22 @@
<variable name="mode_conteneur_actif" type="oui/non" description="No change"> <variable name="mode_conteneur_actif" type="oui/non" description="No change">
<value>non</value> <value>non</value>
</variable> </variable>
<variable name="master" type="string" description="master" multi="True"/> <variable name="leader" type="string" description="leader" multi="True"/>
<variable name="slave1" type="string" description="slave1" multi="True"/> <variable name="follower1" type="string" description="follower1" multi="True"/>
<variable name="slave2" type="string" description="slave2" multi="True"/> <variable name="follower2" type="string" description="follower2" multi="True"/>
</family> </family>
</variables> </variables>
<constraints> <constraints>
<auto name="calc_val" target="slave1"> <auto name="calc_val" target="follower1">
<param name="valeur">valfill</param> <param name="valeur">valfill</param>
</auto> </auto>
<auto name="calc_val" target="slave2"> <auto name="calc_val" target="follower2">
<param type="variable">master</param> <param type="variable">leader</param>
</auto> </auto>
<group master="master"> <group leader="leader">
<slave>slave1</slave> <follower>follower1</follower>
<slave>slave2</slave> <follower>follower2</follower>
</group> </group>
</constraints> </constraints>

2
tests/flattener_dicos/10masterslaves_automaster/makedict/base.json
View File

@ -1 +1 @@
{"creole.general.mode_conteneur_actif": "non", "creole.general.master.master": []} {"creole.general.mode_conteneur_actif": "non", "creole.general.leader.leader": []}

10
tests/flattener_dicos/10masterslaves_automaster/result/00-base.xml
View File

@ -10,10 +10,10 @@
<property>normal</property> <property>normal</property>
<value type="string">non</value> <value type="string">non</value>
</variable> </variable>
<leader doc="master" name="master"> <leader doc="leader" name="leader">
<property>normal</property> <property>normal</property>
<variable doc="master" multi="True" name="master" type="string"/> <variable doc="leader" multi="True" name="leader" type="string"/>
<variable doc="slave1" multi="True" name="slave1" type="string"> <variable doc="follower1" multi="True" name="follower1" type="string">
<property>force_default_on_freeze</property> <property>force_default_on_freeze</property>
<property>frozen</property> <property>frozen</property>
<property>hidden</property> <property>hidden</property>
@ -22,13 +22,13 @@
<param name="valeur" transitive="False" type="string">valfill</param> <param name="valeur" transitive="False" type="string">valfill</param>
</value> </value>
</variable> </variable>
<variable doc="slave2" multi="True" name="slave2" type="string"> <variable doc="follower2" multi="True" name="follower2" type="string">
<property>force_default_on_freeze</property> <property>force_default_on_freeze</property>
<property>frozen</property> <property>frozen</property>
<property>hidden</property> <property>hidden</property>
<property>normal</property> <property>normal</property>
<value name="calc_val" type="calculation"> <value name="calc_val" type="calculation">
<param transitive="False" type="variable">creole.general.master.master</param> <param transitive="False" type="variable">creole.general.leader.leader</param>
</value> </value>
</variable> </variable>
</leader> </leader>

16
tests/flattener_dicos/10masterslaves_automaster_expert/00-base.xml
View File

@ -9,20 +9,20 @@
<value>non</value> <value>non</value>
</variable> </variable>
</family> </family>
<family name="mastermode" mode="expert"> <family name="leadermode" mode="expert">
<variable name="master" type="string" description="master" multi="True"/> <variable name="leader" type="string" description="leader" multi="True"/>
<variable name="slave1" type="string" description="slave1" multi="True"/> <variable name="follower1" type="string" description="follower1" multi="True"/>
<variable name="slave2" type="string" description="slave2" multi="True"/> <variable name="follower2" type="string" description="follower2" multi="True"/>
</family> </family>
</variables> </variables>
<constraints> <constraints>
<auto name="calc_val" target="master"> <auto name="calc_val" target="leader">
<param name="valeur">valfill</param> <param name="valeur">valfill</param>
</auto> </auto>
<group master="master"> <group leader="leader">
<slave>slave1</slave> <follower>follower1</follower>
<slave>slave2</slave> <follower>follower2</follower>
</group> </group>
</constraints> </constraints>

10
tests/flattener_dicos/10masterslaves_automaster_expert/result/00-base.xml
View File

@ -11,22 +11,22 @@
<value type="string">non</value> <value type="string">non</value>
</variable> </variable>
</family> </family>
<family doc="mastermode" name="mastermode"> <family doc="leadermode" name="leadermode">
<property>expert</property> <property>expert</property>
<leader doc="master" name="master"> <leader doc="leader" name="leader">
<property>hidden</property> <property>hidden</property>
<property>expert</property> <property>expert</property>
<variable doc="master" multi="True" name="master" type="string"> <variable doc="leader" multi="True" name="leader" type="string">
<property>force_default_on_freeze</property> <property>force_default_on_freeze</property>
<property>frozen</property> <property>frozen</property>
<value name="calc_val" type="calculation"> <value name="calc_val" type="calculation">
<param name="valeur" transitive="False" type="string">valfill</param> <param name="valeur" transitive="False" type="string">valfill</param>
</value> </value>
</variable> </variable>
<variable doc="slave1" multi="True" name="slave1" type="string"> <variable doc="follower1" multi="True" name="follower1" type="string">
<property>expert</property> <property>expert</property>
</variable> </variable>
<variable doc="slave2" multi="True" name="slave2" type="string"> <variable doc="follower2" multi="True" name="follower2" type="string">
<property>expert</property> <property>expert</property>
</variable> </variable>
</leader> </leader>

18
tests/flattener_dicos/10masterslaves_familyaccent/00-base.xml
View File

@ -8,22 +8,22 @@
<variable name="mode_conteneur_actif" type="oui/non" description="No change"> <variable name="mode_conteneur_actif" type="oui/non" description="No change">
<value>non</value> <value>non</value>
</variable> </variable>
<variable name="master" type="string" description="master" multi="True"/> <variable name="leader" type="string" description="leader" multi="True"/>
<variable name="slave1" type="string" description="slave1" multi="True"/> <variable name="follower1" type="string" description="follower1" multi="True"/>
<variable name="slave2" type="string" description="slave2" multi="True"/> <variable name="follower2" type="string" description="follower2" multi="True"/>
</family> </family>
</variables> </variables>
<constraints> <constraints>
<fill name="calc_val" target="slave1"> <fill name="calc_val" target="follower1">
<param name="valeur">valfill</param> <param name="valeur">valfill</param>
</fill> </fill>
<fill name="calc_val" target="slave2"> <fill name="calc_val" target="follower2">
<param type="variable">slave1</param> <param type="variable">follower1</param>
</fill> </fill>
<group master="master"> <group leader="leader">
<slave>slave1</slave> <follower>follower1</follower>
<slave>slave2</slave> <follower>follower2</follower>
</group> </group>
</constraints> </constraints>

2
tests/flattener_dicos/10masterslaves_familyaccent/makedict/base.json
View File

@ -1 +1 @@
{"creole.general.mode_conteneur_actif": "non", "creole.general.master.master": [], "creole.general.master.slave1": [], "creole.general.master.slave2": []} {"creole.general.mode_conteneur_actif": "non", "creole.general.leader.leader": [], "creole.general.leader.follower1": [], "creole.general.leader.follower2": []}

10
tests/flattener_dicos/10masterslaves_familyaccent/result/00-base.xml
View File

@ -10,19 +10,19 @@
<property>normal</property> <property>normal</property>
<value type="string">non</value> <value type="string">non</value>
</variable> </variable>
<leader doc="master" name="master"> <leader doc="leader" name="leader">
<property>normal</property> <property>normal</property>
<variable doc="master" multi="True" name="master" type="string"/> <variable doc="leader" multi="True" name="leader" type="string"/>
<variable doc="slave1" multi="True" name="slave1" type="string"> <variable doc="follower1" multi="True" name="follower1" type="string">
<property>normal</property> <property>normal</property>
<value name="calc_val" type="calculation"> <value name="calc_val" type="calculation">
<param name="valeur" transitive="False" type="string">valfill</param> <param name="valeur" transitive="False" type="string">valfill</param>
</value> </value>
</variable> </variable>
<variable doc="slave2" multi="True" name="slave2" type="string"> <variable doc="follower2" multi="True" name="follower2" type="string">
<property>normal</property> <property>normal</property>
<value name="calc_val" type="calculation"> <value name="calc_val" type="calculation">
<param transitive="False" type="variable">creole.general.master.slave1</param> <param transitive="False" type="variable">creole.general.leader.follower1</param>
</value> </value>
</variable> </variable>
</leader> </leader>

14
tests/flattener_dicos/10valid_enum_master/00-base.xml
View File

@ -8,20 +8,20 @@
<variable name="mode_conteneur_actif" type="oui/non" description="No change"> <variable name="mode_conteneur_actif" type="oui/non" description="No change">
<value>non</value> <value>non</value>
</variable> </variable>
<variable name="master" type="string" description="master" multi="True"/> <variable name="leader" type="string" description="leader" multi="True"/>
<variable name="slave1" type="string" description="slave1" multi="True"/> <variable name="follower1" type="string" description="follower1" multi="True"/>
<variable name="slave2" type="string" description="slave2" multi="True"/> <variable name="follower2" type="string" description="follower2" multi="True"/>
</family> </family>
<separators/> <separators/>
</variables> </variables>
<constraints> <constraints>
<check name="valid_enum" target="slave1"> <check name="valid_enum" target="follower1">
<param>['a','b','c']</param> <param>['a','b','c']</param>
</check> </check>
<group master="master"> <group leader="leader">
<slave>slave1</slave> <follower>follower1</follower>
<slave>slave2</slave> <follower>follower2</follower>
</group> </group>
</constraints> </constraints>

2
tests/flattener_dicos/10valid_enum_master/makedict/base.json
View File

@ -1 +1 @@
{"creole.general.mode_conteneur_actif": "non", "creole.general.master.master": [], "creole.general.master.slave1": [], "creole.general.master.slave2": []} {"creole.general.mode_conteneur_actif": "non", "creole.general.leader.leader": [], "creole.general.leader.follower1": [], "creole.general.leader.follower2": []}

8
tests/flattener_dicos/10valid_enum_master/result/00-base.xml
View File

@ -10,10 +10,10 @@
<property>normal</property> <property>normal</property>
<value type="string">non</value> <value type="string">non</value>
</variable> </variable>
<leader doc="master" name="master"> <leader doc="leader" name="leader">
<property>normal</property> <property>normal</property>
<variable doc="master" multi="True" name="master" type="string"/> <variable doc="leader" multi="True" name="leader" type="string"/>
<variable doc="slave1" multi="True" name="slave1" type="choice"> <variable doc="follower1" multi="True" name="follower1" type="choice">
<choice type="string">a</choice> <choice type="string">a</choice>
<choice type="string">b</choice> <choice type="string">b</choice>
<choice type="string">c</choice> <choice type="string">c</choice>
@ -21,7 +21,7 @@
<property>normal</property> <property>normal</property>
<value type="string">a</value> <value type="string">a</value>
</variable> </variable>
<variable doc="slave2" multi="True" name="slave2" type="string"> <variable doc="follower2" multi="True" name="follower2" type="string">
<property>normal</property> <property>normal</property>
</variable> </variable>
</leader> </leader>

12
tests/flattener_dicos/20family_modemasterslaves/00-base.xml
View File

@ -8,17 +8,17 @@
<variable name="mode_conteneur_actif" type="oui/non" description="No change"> <variable name="mode_conteneur_actif" type="oui/non" description="No change">
<value>non</value> <value>non</value>
</variable> </variable>
<variable name="master" type="string" description="master" multi="True"/> <variable name="leader" type="string" description="leader" multi="True"/>
<variable name="slave1" type="string" description="slave1" multi="True"/> <variable name="follower1" type="string" description="follower1" multi="True"/>
<variable name="slave2" type="string" description="slave2" multi="True" mode="basic"/> <variable name="follower2" type="string" description="follower2" multi="True" mode="basic"/>
</family> </family>
<separators/> <separators/>
</variables> </variables>
<constraints> <constraints>
<group master="master"> <group leader="leader">
<slave>slave1</slave> <follower>follower1</follower>
<slave>slave2</slave> <follower>follower2</follower>
</group> </group>
</constraints> </constraints>

2
tests/flattener_dicos/20family_modemasterslaves/makedict/base.json
View File

@ -1 +1 @@
{"creole.general.mode_conteneur_actif": "non", "creole.general.master.master": [], "creole.general.master.slave1": [], "creole.general.master.slave2": []} {"creole.general.mode_conteneur_actif": "non", "creole.general.leader.leader": [], "creole.general.leader.follower1": [], "creole.general.leader.follower2": []}

8
tests/flattener_dicos/20family_modemasterslaves/result/00-base.xml
View File

@ -10,13 +10,13 @@
<property>normal</property> <property>normal</property>
<value type="string">non</value> <value type="string">non</value>
</variable> </variable>
<leader doc="master" name="master"> <leader doc="leader" name="leader">
<property>normal</property> <property>normal</property>
<variable doc="master" multi="True" name="master" type="string"/> <variable doc="leader" multi="True" name="leader" type="string"/>
<variable doc="slave1" multi="True" name="slave1" type="string"> <variable doc="follower1" multi="True" name="follower1" type="string">
<property>normal</property> <property>normal</property>
</variable> </variable>
<variable doc="slave2" multi="True" name="slave2" type="string"> <variable doc="follower2" multi="True" name="follower2" type="string">
<property>normal</property> <property>normal</property>
</variable> </variable>
</leader> </leader>

14
tests/flattener_dicos/40ifin_masterslaves/00-base.xml
View File

@ -9,20 +9,20 @@
<value>non</value> <value>non</value>
</variable> </variable>
<variable name="condition" type="oui/non" description="condition"/> <variable name="condition" type="oui/non" description="condition"/>
<variable name="master" type="string" description="master" multi="True"/> <variable name="leader" type="string" description="leader" multi="True"/>
<variable name="slave1" type="string" description="slave1" multi="True"/> <variable name="follower1" type="string" description="follower1" multi="True"/>
<variable name="slave2" type="string" description="slave2" multi="True"/> <variable name="follower2" type="string" description="follower2" multi="True"/>
</family> </family>
</variables> </variables>
<constraints> <constraints>
<group master="master"> <group leader="leader">
<slave>slave1</slave> <follower>follower1</follower>
<slave>slave2</slave> <follower>follower2</follower>
</group> </group>
<condition name="disabled_if_in" source="condition"> <condition name="disabled_if_in" source="condition">
<param>oui</param> <param>oui</param>
<target type="variable">slave1</target> <target type="variable">follower1</target>
</condition> </condition>
</constraints> </constraints>

2
tests/flattener_dicos/40ifin_masterslaves/makedict/base.json
View File

@ -1 +1 @@
{"creole.general.mode_conteneur_actif": "non", "creole.general.condition": "oui", "creole.general.master.master": [], "creole.general.master.slave2": []} {"creole.general.mode_conteneur_actif": "non", "creole.general.condition": "oui", "creole.general.leader.leader": [], "creole.general.leader.follower2": []}

8
tests/flattener_dicos/40ifin_masterslaves/result/00-base.xml
View File

@ -17,14 +17,14 @@
<property>normal</property> <property>normal</property>
<value type="string">oui</value> <value type="string">oui</value>
</variable> </variable>
<leader doc="master" name="master"> <leader doc="leader" name="leader">
<property>normal</property> <property>normal</property>
<variable doc="master" multi="True" name="master" type="string"/> <variable doc="leader" multi="True" name="leader" type="string"/>
<variable doc="slave1" multi="True" name="slave1" type="string"> <variable doc="follower1" multi="True" name="follower1" type="string">
<property>normal</property> <property>normal</property>
<property expected="oui" inverse="False" source="creole.general.condition" type="calculation">disabled</property> <property expected="oui" inverse="False" source="creole.general.condition" type="calculation">disabled</property>
</variable> </variable>
<variable doc="slave2" multi="True" name="slave2" type="string"> <variable doc="follower2" multi="True" name="follower2" type="string">
<property>normal</property> <property>normal</property>
</variable> </variable>
</leader> </leader>

16
tests/flattener_dicos/40ifin_masterslavesauto/00-base.xml
View File

@ -9,23 +9,23 @@
<value>non</value> <value>non</value>
</variable> </variable>
<variable name="condition" type="oui/non" description="condition"/> <variable name="condition" type="oui/non" description="condition"/>
<variable name="master" type="string" description="master" multi="True"/> <variable name="leader" type="string" description="leader" multi="True"/>
<variable name="slave1" type="string" description="slave1" multi="True"/> <variable name="follower1" type="string" description="follower1" multi="True"/>
<variable name="slave2" type="string" description="slave2" multi="True"/> <variable name="follower2" type="string" description="follower2" multi="True"/>
</family> </family>
</variables> </variables>
<constraints> <constraints>
<group master="master"> <group leader="leader">
<slave>slave1</slave> <follower>follower1</follower>
<slave>slave2</slave> <follower>follower2</follower>
</group> </group>
<auto name="calc_val" target="slave1"> <auto name="calc_val" target="follower1">
<param name="valeur">valfill</param> <param name="valeur">valfill</param>
</auto> </auto>
<condition name="disabled_if_in" source="condition"> <condition name="disabled_if_in" source="condition">
<param>oui</param> <param>oui</param>
<target type="variable">slave1</target> <target type="variable">follower1</target>
</condition> </condition>
</constraints> </constraints>

2
tests/flattener_dicos/40ifin_masterslavesauto/makedict/base.json
View File

@ -1 +1 @@
{"creole.general.mode_conteneur_actif": "non", "creole.general.condition": "oui", "creole.general.master.master": [], "creole.general.master.slave2": []} {"creole.general.mode_conteneur_actif": "non", "creole.general.condition": "oui", "creole.general.leader.leader": [], "creole.general.leader.follower2": []}

8
tests/flattener_dicos/40ifin_masterslavesauto/result/00-base.xml
View File

@ -17,10 +17,10 @@
<property>normal</property> <property>normal</property>
<value type="string">oui</value> <value type="string">oui</value>
</variable> </variable>
<leader doc="master" name="master"> <leader doc="leader" name="leader">
<property>normal</property> <property>normal</property>
<variable doc="master" multi="True" name="master" type="string"/> <variable doc="leader" multi="True" name="leader" type="string"/>
<variable doc="slave1" multi="True" name="slave1" type="string"> <variable doc="follower1" multi="True" name="follower1" type="string">
<property>force_default_on_freeze</property> <property>force_default_on_freeze</property>
<property>frozen</property> <property>frozen</property>
<property>hidden</property> <property>hidden</property>
@ -30,7 +30,7 @@
<param name="valeur" transitive="False" type="string">valfill</param> <param name="valeur" transitive="False" type="string">valfill</param>
</value> </value>
</variable> </variable>
<variable doc="slave2" multi="True" name="slave2" type="string"> <variable doc="follower2" multi="True" name="follower2" type="string">
<property>normal</property> <property>normal</property>
</variable> </variable>
</leader> </leader>

4
tests/flattener_dicos/60extra_group/extra_dirs/extra/00-base.xml
View File

@ -12,8 +12,8 @@
</family> </family>
</variables> </variables>
<constraints> <constraints>
<group master="extra.ejabberd.description"> <group leader="extra.ejabberd.description">
<slave>mode</slave> <follower>mode</follower>
</group> </group>
</constraints> </constraints>
</rougail> </rougail>

4
tests/flattener_dicos/70container_pathaccess_masterslaves/00-base.xml
View File

@ -20,8 +20,8 @@
</variables> </variables>
<constraints> <constraints>
<group master="nut_monitor_netmask"> <group leader="nut_monitor_netmask">
<slave>nut_monitor_host</slave> <follower>nut_monitor_host</follower>
</group> </group>
</constraints> </constraints>

2
tests/flattener_dicos/80condition_itself/00-base.xml
View File

@ -7,7 +7,7 @@
</variables> </variables>
<constraints> <constraints>
<condition name="disabled_if_in" source="replicationType"> <condition name="disabled_if_in" source="replicationType">
<param>master-master</param> <param>leader-leader</param>
<target type="variable">replicationType</target> <target type="variable">replicationType</target>
</condition> </condition>
</constraints> </constraints>

18
tests/flattener_dicos/80family_several/00-base.xml
View File

@ -10,22 +10,22 @@
</variable> </variable>
</family> </family>
<family name="general"> <family name="general">
<variable name="master" type="string" description="master" multi="True"/> <variable name="leader" type="string" description="leader" multi="True"/>
<variable name="slave1" type="string" description="slave1" multi="True"/> <variable name="follower1" type="string" description="follower1" multi="True"/>
<variable name="slave2" type="string" description="slave2" multi="True"/> <variable name="follower2" type="string" description="follower2" multi="True"/>
</family> </family>
</variables> </variables>
<constraints> <constraints>
<fill name="calc_val" target="slave1"> <fill name="calc_val" target="follower1">
<param name="valeur">valfill</param> <param name="valeur">valfill</param>
</fill> </fill>
<fill name="calc_val" target="slave2"> <fill name="calc_val" target="follower2">
<param type="variable">slave1</param> <param type="variable">follower1</param>
</fill> </fill>
<group master="master"> <group leader="leader">
<slave>slave1</slave> <follower>follower1</follower>
<slave>slave2</slave> <follower>follower2</follower>
</group> </group>
</constraints> </constraints>

18
tests/flattener_dicos/80leadership_none_slave_between_slave/00-base.xml
View File

@ -5,25 +5,25 @@
<variables> <variables>
<family name="general"> <family name="general">
<variable name="master" type="string" description="master" multi="True"/> <variable name="leader" type="string" description="leader" multi="True"/>
<variable name="mode_conteneur_actif" type="oui/non" description="No change"> <variable name="mode_conteneur_actif" type="oui/non" description="No change">
<value>non</value> <value>non</value>
</variable> </variable>
<variable name="slave1" type="string" description="slave1" multi="True"/> <variable name="follower1" type="string" description="follower1" multi="True"/>
<variable name="slave2" type="string" description="slave2" multi="True"/> <variable name="follower2" type="string" description="follower2" multi="True"/>
</family> </family>
</variables> </variables>
<constraints> <constraints>
<fill name="calc_val" target="slave1"> <fill name="calc_val" target="follower1">
<param name="valeur">valfill</param> <param name="valeur">valfill</param>
</fill> </fill>
<fill name="calc_val" target="slave2"> <fill name="calc_val" target="follower2">
<param type="variable">slave1</param> <param type="variable">follower1</param>
</fill> </fill>
<group master="master"> <group leader="leader">
<slave>slave1</slave> <follower>follower1</follower>
<slave>slave2</slave> <follower>follower2</follower>
</group> </group>
</constraints> </constraints>

18
tests/flattener_dicos/80leadership_not_ordered/00-base.xml
View File

@ -10,22 +10,22 @@
</variable> </variable>
</family> </family>
<family name="general1"> <family name="general1">
<variable name="master" type="string" description="master" multi="True"/> <variable name="leader" type="string" description="leader" multi="True"/>
<variable name="slave1" type="string" description="slave1" multi="True"/> <variable name="follower1" type="string" description="follower1" multi="True"/>
<variable name="slave2" type="string" description="slave2" multi="True"/> <variable name="follower2" type="string" description="follower2" multi="True"/>
</family> </family>
</variables> </variables>
<constraints> <constraints>
<fill name="calc_val" target="slave1"> <fill name="calc_val" target="follower1">
<param name="valeur">valfill</param> <param name="valeur">valfill</param>
</fill> </fill>
<fill name="calc_val" target="slave2"> <fill name="calc_val" target="follower2">
<param type="variable">slave1</param> <param type="variable">follower1</param>
</fill> </fill>
<group master="master"> <group leader="leader">
<slave>slave2</slave> <follower>follower2</follower>
<slave>slave1</slave> <follower>follower1</follower>
</group> </group>
</constraints> </constraints>

18
tests/flattener_dicos/80leadership_not_same_family/00-base.xml
View File

@ -10,24 +10,24 @@
</variable> </variable>
</family> </family>
<family name="general1"> <family name="general1">
<variable name="master" type="string" description="master" multi="True"/> <variable name="leader" type="string" description="leader" multi="True"/>
<variable name="slave1" type="string" description="slave1" multi="True"/> <variable name="follower1" type="string" description="follower1" multi="True"/>
</family> </family>
<family name="general2"> <family name="general2">
<variable name="slave2" type="string" description="slave2" multi="True"/> <variable name="follower2" type="string" description="follower2" multi="True"/>
</family> </family>
</variables> </variables>
<constraints> <constraints>
<fill name="calc_val" target="slave1"> <fill name="calc_val" target="follower1">
<param name="valeur">valfill</param> <param name="valeur">valfill</param>
</fill> </fill>
<fill name="calc_val" target="slave2"> <fill name="calc_val" target="follower2">
<param type="variable">slave1</param> <param type="variable">follower1</param>
</fill> </fill>
<group master="master"> <group leader="leader">
<slave>slave1</slave> <follower>follower1</follower>
<slave>slave2</slave> <follower>follower2</follower>
</group> </group>
</constraints> </constraints>

18
tests/flattener_dicos/80leadership_notmulti2/00-base.xml
View File

@ -10,22 +10,22 @@
</variable> </variable>
</family> </family>
<family name="general1"> <family name="general1">
<variable name="master" type="string" description="master" multi="True"/> <variable name="leader" type="string" description="leader" multi="True"/>
<variable name="slave1" type="string" description="slave1"/> <variable name="follower1" type="string" description="follower1"/>
<variable name="slave2" type="string" description="slave2" multi="True"/> <variable name="follower2" type="string" description="follower2" multi="True"/>
</family> </family>
</variables> </variables>
<constraints> <constraints>
<fill name="calc_val" target="slave1"> <fill name="calc_val" target="follower1">
<param name="valeur">valfill</param> <param name="valeur">valfill</param>
</fill> </fill>
<fill name="calc_val" target="slave2"> <fill name="calc_val" target="follower2">
<param type="variable">slave1</param> <param type="variable">follower1</param>
</fill> </fill>
<group master="master"> <group leader="leader">
<slave>slave1</slave> <follower>follower1</follower>
<slave>slave2</slave> <follower>follower2</follower>
</group> </group>
</constraints> </constraints>

18
tests/flattener_dicos/80masterslave_auto_save/00-base.xml
View File

@ -8,22 +8,22 @@
<variable name="mode_conteneur_actif" type="oui/non" description="No change"> <variable name="mode_conteneur_actif" type="oui/non" description="No change">
<value>non</value> <value>non</value>
</variable> </variable>
<variable name="master" type="string" description="master" multi="True"/> <variable name="leader" type="string" description="leader" multi="True"/>
<variable name="slave1" type="string" description="slave1" multi="True"/> <variable name="follower1" type="string" description="follower1" multi="True"/>
<variable name="slave2" type="string" description="slave2" auto_save="True" multi="True"/> <variable name="follower2" type="string" description="follower2" auto_save="True" multi="True"/>
</family> </family>
</variables> </variables>
<constraints> <constraints>
<fill name="calc_val" target="slave1"> <fill name="calc_val" target="follower1">
<param name="valeur">valfill</param> <param name="valeur">valfill</param>
</fill> </fill>
<fill name="calc_val" target="slave2"> <fill name="calc_val" target="follower2">
<param type="variable">slave1</param> <param type="variable">follower1</param>
</fill> </fill>
<group master="master"> <group leader="leader">
<slave>slave1</slave> <follower>follower1</follower>
<slave>slave2</slave> <follower>follower2</follower>
</group> </group>
</constraints> </constraints>

24
tests/flattener_dicos/80masterslave_notexists/00-base.xml
View File

@ -8,26 +8,26 @@
<variable name="mode_conteneur_actif" type="oui/non" description="No change"> <variable name="mode_conteneur_actif" type="oui/non" description="No change">
<value>non</value> <value>non</value>
</variable> </variable>
<variable name="master" type="string" description="master" multi="True"/> <variable name="leader" type="string" description="leader" multi="True"/>
<variable name="slave1" type="string" description="slave1" multi="True"/> <variable name="follower1" type="string" description="follower1" multi="True"/>
<variable name="slave2" type="string" description="slave2" auto_save="True" multi="True"/> <variable name="follower2" type="string" description="follower2" auto_save="True" multi="True"/>
</family> </family>
</variables> </variables>
<constraints> <constraints>
<fill name="calc_val" target="slave1"> <fill name="calc_val" target="follower1">
<param name="valeur">valfill</param> <param name="valeur">valfill</param>
</fill> </fill>
<fill name="calc_val" target="slave2"> <fill name="calc_val" target="follower2">
<param type="variable">slave1</param> <param type="variable">follower1</param>
</fill> </fill>
<group master="master"> <group leader="leader">
<slave>slave1</slave> <follower>follower1</follower>
<slave>slave2</slave> <follower>follower2</follower>
</group> </group>
<group master="master1"> <group leader="leader1">
<slave>slave3</slave> <follower>follower3</follower>
<slave>slave4</slave> <follower>follower4</follower>
</group> </group>
</constraints> </constraints>

18
tests/flattener_dicos/80masterslaves_autofreeze/00-base.xml
View File

@ -5,22 +5,22 @@
<variables> <variables>
<family name="general"> <family name="general">
<variable name="master" type="string" description="master" auto_freeze="True"/> <variable name="leader" type="string" description="leader" auto_freeze="True"/>
<variable name="slave1" type="string" description="slave1"/> <variable name="follower1" type="string" description="follower1"/>
<variable name="slave2" type="string" description="slave2"/> <variable name="follower2" type="string" description="follower2"/>
</family> </family>
</variables> </variables>
<constraints> <constraints>
<fill name="calc_val" target="slave1"> <fill name="calc_val" target="follower1">
<param name="valeur">valfill</param> <param name="valeur">valfill</param>
</fill> </fill>
<fill name="calc_val" target="slave2"> <fill name="calc_val" target="follower2">
<param type="variable">slave1</param> <param type="variable">follower1</param>
</fill> </fill>
<group master="master"> <group leader="leader">
<slave>slave1</slave> <follower>follower1</follower>
<slave>slave2</slave> <follower>follower2</follower>
</group> </group>
</constraints> </constraints>

18
tests/flattener_dicos/80masterslaves_notmulti/00-base.xml
View File

@ -5,22 +5,22 @@
<variables> <variables>
<family name="general"> <family name="general">
<variable name="master" type="string" description="master"/> <variable name="leader" type="string" description="leader"/>
<variable name="slave1" type="string" description="slave1"/> <variable name="follower1" type="string" description="follower1"/>
<variable name="slave2" type="string" description="slave2"/> <variable name="follower2" type="string" description="follower2"/>
</family> </family>
</variables> </variables>
<constraints> <constraints>
<fill name="calc_val" target="slave1"> <fill name="calc_val" target="follower1">
<param name="valeur">valfill</param> <param name="valeur">valfill</param>
</fill> </fill>
<fill name="calc_val" target="slave2"> <fill name="calc_val" target="follower2">
<param type="variable">slave1</param> <param type="variable">follower1</param>
</fill> </fill>
<group master="master"> <group leader="leader">
<slave>slave1</slave> <follower>follower1</follower>
<slave>slave2</slave> <follower>follower2</follower>
</group> </group>
</constraints> </constraints>