diff --git a/docs/check.rst b/docs/check.rst index 45801ed8e..82ccd7f3f 100644 --- a/docs/check.rst +++ b/docs/check.rst @@ -117,7 +117,7 @@ Here is a simple example of validating values: .. code-block:: yaml --- - version: '1.0' + version: '1.1' my_variable: validators: - type: jinja @@ -142,7 +142,7 @@ In the constraint, it is possible to specify the error level and put it as a war .. code-block:: yaml --- - version: '1.0' + version: '1.1' my_variable: validators: - type: jinja @@ -161,7 +161,7 @@ Verification with parameters .. code-block:: yaml --- - version: '1.0' + version: '1.1' my_hidden_variable: disabled: true my_variable: @@ -189,7 +189,7 @@ An example with a suffix type parameter: .. code-block:: yaml --- - version: '1.0' + version: '1.1' varname: multi: true default: @@ -221,7 +221,7 @@ An example with an index type parameter: .. code-block:: yaml --- - version: '1.0' + version: '1.1' family: type: leadership leader: @@ -249,7 +249,7 @@ In a first dictionary, let's declare our variable and its verification function: .. code-block:: yaml --- - version: '1.0' + version: '1.1' my_variable: validators: - type: jinja @@ -263,7 +263,7 @@ In a second dictionary it is possible to redefine the calculation: .. code-block:: yaml --- - version: '1.0' + version: '1.1' my_variable: redefine: true validators: @@ -280,7 +280,7 @@ Here is a third dictionary in which we remove the validation: .. code-block:: yaml --- - version: '1.0' + version: '1.1' my_variable: redefine: true validators: diff --git a/docs/condition.rst b/docs/condition.rst index 4fa7f5b96..3d1895639 100644 --- a/docs/condition.rst +++ b/docs/condition.rst @@ -177,7 +177,7 @@ It is possible to write the condition in Jinja: .. code-block:: yaml --- - version: '1.0' + version: '1.1' condition: default: 'do not hide!' my_variable: @@ -213,7 +213,7 @@ A variable can therefore be calculated via the result of another variable. Pleas .. code-block:: yaml --- - version: '1.0' + version: '1.1' condition: type: boolean my_variable: @@ -233,7 +233,7 @@ To delete the calculation from a variable, simply do in a new dictionary: .. code-block:: yaml --- - version: '1.0' + version: '1.1' my_variable: redefine: true hidden: diff --git a/docs/family.rst b/docs/family.rst index cc39bdc7a..d7080f9d0 100644 --- a/docs/family.rst +++ b/docs/family.rst @@ -20,30 +20,30 @@ Parameters .. FIXME: faire une page sur la "convention on variable names" -.. list-table:: +.. list-table:: :widths: 15 45 :header-rows: 1 * - Parameter - Comments - + * - type, _type `string` - + - possile values: - + - `family` (**default value**) - `leadership` - `dynamic` - + .. note:: If a subfamily or a subvariable already has the name `"type"`, it is possible to use the `"_type"` attribute. * - description, _description `string` - Description of the family. - + User information to understand the usefulness of the family. ..note:: If a subfamily or subvariable already has the name "description" it is possible to use the "_description" attribute. @@ -53,7 +53,7 @@ Parameters `string` - Additional help associated with the family. - .. note:: If a subfamily or a subvariable already has the name "help" it is possible to use the "_help" attribute. + .. note:: If a subfamily or a subvariable already has the name "help" it is possible to use the "_help" attribute. * - mode, _mode @@ -61,30 +61,30 @@ Parameters - Family mode. The default mode of a family is the smallest mode of the parent families, child variables, or child families that are contained in that family. - + This mode also allows you to define the default mode for variables or families included in this family. - + .. note:: If a subfamily or a subvariable already has the name "mode" it is possible to add the "_mode" attribute. * - hidden, _hidden `string` - Invisible family. - + Allows you to hide a family as well as the variables or families included in this family. This means that the family will no longer be visible in `read-write` mode, but only for calculations or in `read-only` mode. - .. note:: If a subfamily or a subvariable already has the name "hidden" it is possible to add the "_hidden" attribute. + .. note:: If a subfamily or a subvariable already has the name "hidden" it is possible to add the "_hidden" attribute. * - disabled, _disabled `string` - Disabled family. - + Allows you to deactivate a family as well as the variables or families included in this family. - + This means that the family will no longer be visible to the user but also to a :term:`calculation`. .. note:: If a subfamily or a subvariable already has the name "disabled" it is possible to use the "_disabled" attribute. @@ -92,25 +92,18 @@ Parameters Dynamically created family ----------------------------- -To create a family dynamically, you must create a fictitious family linked to a variable. -The family name and description will actually be the prefix of the new name / description. -The suffix will come from the value of the bound variable. -The name of the families and variables it contains will be preserved, however, the description will be the prefix of the real description. +To create a family dynamically, you must create a fictitious family linked to a calculation. +The family name will actually be the prefix of the new name. Alternativly you can specify the suffix in the name, ie `my_{{ suffix }}_name`. +The suffix will come from the calculation. -Obviously if the content of the linked variable were to evolve, new dynamic families will appear or disappear. +Obviously if the result of calculation were to evolve, new dynamic families will appear or disappear. -To note that: - -- the variable linked to the family must be a multiple variable -- it is not possible to put a simple family into a dynamic family -- it is possible to put a leading family into a dynamic family - -Leader or foller variable +Leader or follower variable ----------------------------- A leader family has a typical attribute of “leadership”. The type is required. -A leader family +A leader family ---------------- The leader and follower variables are placed in a leader family. @@ -150,25 +143,25 @@ If a leader variable is hidden or disabled, the follower variables will be hidde Examples ---------- -Simple family +Simple family: .. code-block:: yaml --- - version: '1.0' + version: '1.1' my_family: type: family description: This is a great family help: This is the help of a great family mode: expert -Dynamically created family +Dynamically created family ---------------------------- .. code-block:: yaml --- - version: '1.0' + version: '1.1' varname: multi: true default: @@ -176,20 +169,50 @@ Dynamically created family - val2 my_dyn_family_: type: dynamic - variable: rougail.varname - description: 'Describe ' + dynamic: + type: variable + variable: rougail.varname + description: 'Describe' my_dyn_var: type: string - description: 'Variable description for ' + description: 'Variable description' This will dynamically create two families: -- "rougail.my_dyn_family_val1" with the description "Describe val1" -- "rougail.my_dyn_family_val2" with the description "Describe val2" +- "rougail.my_dyn_family_val1" +- "rougail.my_dyn_family_val2" -In the dynamic family "rougail.my_dyn_family_val1" we will find a variable "my_dyn_var" with the description "Variable description for val1". +In the dynamic family "rougail.my_dyn_family_val1" we will find a variable "my_dyn_var". -Leader or follower variable +Here is a second example: + +.. code-block:: yaml + + --- + version: '1.1' + varname: + multi: true + default: + - val1 + - val2 + my_dyn_{{ suffix }}_family: + type: dynamic + dynamic: + type: variable + variable: rougail.varname + description: 'Describe' + my_dyn_var: + type: string + description: 'Variable description' + +This will dynamically create two families: + +- "rougail.my_dyn_val1_family" +- "rougail.my_dyn_val2_family" + +In the dynamic family "rougail.my_dyn_val1_family" we will find a variable "my_dyn_var". + +Leader or follower variable ------------------------------- Definition of leader and follower variables @@ -200,7 +223,7 @@ Here is an example of defining a leading variable and two following variables: .. code-block:: yaml --- - version: '1.0' + version: '1.1' family: type: leadership leader: @@ -217,7 +240,6 @@ To add a new follower variable, in a new dictionary, simply define one or more n .. code-block:: yaml --- - version: '1.0' + version: '1.1' family: follower3: - diff --git a/docs/fill.rst b/docs/fill.rst index 90abce951..c4b5eca58 100644 --- a/docs/fill.rst +++ b/docs/fill.rst @@ -167,7 +167,7 @@ Let's start with an example from a simple Jinja template: .. code-block:: yaml --- - version: '1.0' + version: '1.1' my_calculated_variable: default: type: jinja @@ -178,7 +178,7 @@ Here is a second example with a boolean variable: .. code-block:: yaml --- - version: '1.0' + version: '1.1' my_calculated_variable: type: boolean default: @@ -190,7 +190,7 @@ And a multiple value of the number type: .. code-block:: yaml --- - version: '1.0' + version: '1.1' my_calculated_variable: type: number multi: true @@ -206,7 +206,7 @@ Let's create a variable whose value is returned by a python function: .. code-block:: yaml --- - version: '1.0' + version: '1.1' my_calculated_variable: default: type: jinja @@ -224,7 +224,7 @@ An example with parameters: .. code-block:: yaml --- - version: '1.0' + version: '1.1' my_calculated_variable: description: my description default: @@ -247,7 +247,7 @@ An example with a `suffix` type parameter: .. code-block:: yaml --- - version: '1.0' + version: '1.1' varname: multi: true default: @@ -255,7 +255,9 @@ An example with a `suffix` type parameter: - val2 my_dyn_family_: type: dynamic - variable: rougail.varname + dynamic: + type: variable + variable: rougail.varname description: 'Describe ' my_dyn_var: type: string @@ -275,7 +277,7 @@ An example with an index type parameter: .. code-block:: yaml --- - version: '1.0' + version: '1.1' family: type: leadership leader: @@ -299,7 +301,7 @@ Copy a variable in another: .. code-block:: yaml --- - version: '1.0' + version: '1.1' my_variable: multi: true default: @@ -316,7 +318,7 @@ Copy one variable to another if the source has no `property` problem: .. code-block:: yaml --- - version: '1.0' + version: '1.1' my_variable: default: val1 disabled: true @@ -332,7 +334,7 @@ Copy two non-multiple variables into a multiple variable: .. code-block:: yaml --- - version: '1.0' + version: '1.1' my_variable_1: default: val1 my_variable_2: @@ -352,7 +354,7 @@ For example using the variable for a particular suffix: .. code-block:: yaml --- - version: '1.0' + version: '1.1' varname: multi: true default: @@ -360,7 +362,9 @@ For example using the variable for a particular suffix: - val2 my_dyn_family_: type: dynamic - variable: rougail.varname + dynamic: + type: variable + variable: rougail.varname description: 'Describe ' my_dyn_var_: type: string @@ -378,7 +382,7 @@ Second example using the variable for all suffixes: .. code-block:: yaml --- - version: '1.0' + version: '1.1' varname: multi: true default: @@ -386,7 +390,9 @@ Second example using the variable for all suffixes: - val2 my_dyn_family_: type: dynamic - variable: rougail.varname + dynamic: + type: variable + variable: rougail.varname description: 'Describe ' my_dyn_var_: type: string @@ -406,7 +412,7 @@ Calculation via a suffix .. code-block:: yaml --- - version: '1.0' + version: '1.1' varname: multi: true default: @@ -414,7 +420,9 @@ Calculation via a suffix - val2 my_dyn_family_: type: dynamic - variable: rougail.varname + dynamic: + type: variable + variable: rougail.varname description: 'Describe ' my_dyn_var_: type: string @@ -427,7 +435,7 @@ Calculation via an index .. code-block:: yaml --- - version: '1.0' + version: '1.1' family: type: leadership leader: @@ -448,7 +456,7 @@ In a first dictionary, let's declare our variable and our calculation: .. code-block:: yaml --- - version: '1.0' + version: '1.1' my_calculated_variable: default: type: jinja @@ -459,7 +467,7 @@ In a second dictionary, it is possible to redefine the calculation: .. code-block:: yaml --- - version: '1.0' + version: '1.1' my_calculated_variable: redefine: true default: @@ -471,7 +479,7 @@ In a third dictionary, we even can delete the calculation if needed: .. code-block:: yaml --- - version: '1.0' + version: '1.1' my_calculated_variable: redefine: true default: null diff --git a/docs/gettingstarted.rst b/docs/gettingstarted.rst index 6cdf74c34..894d12c35 100644 --- a/docs/gettingstarted.rst +++ b/docs/gettingstarted.rst @@ -65,7 +65,7 @@ Here is a :term:`dictionary` example: :linenos: --- - version: '1.0' + version: '1.1' proxy: description: Configure Proxy Access to the Internet type: family @@ -126,7 +126,7 @@ Here is the tree structure we want to have:: :caption: The `hello.yaml` file --- - version: '1.0' + version: '1.1' hello: default: world @@ -168,7 +168,7 @@ Let's continuing on our "Hello world" theme and add a :term:`family` container. :linenos: --- - version: '1.0' + version: '1.1' world: description: Hello world family container name: diff --git a/docs/library.rst b/docs/library.rst index 1c5784bb0..b9a91d548 100644 --- a/docs/library.rst +++ b/docs/library.rst @@ -26,7 +26,7 @@ Here is a first :file:`dict/00-base.yml` dictionary: .. code-block:: yaml --- - version: '1.0' + version: '1.1' my_variable: default: my_value @@ -71,7 +71,7 @@ Then let's create an extra :term:`dictionary` :file:`extras/00-base.yml`: .. code-block:: yaml :caption: the :file:`extras/00-base.yml` file content --- - version: '1.0' + version: '1.1' my_variable_extra: default: my_value_extra @@ -103,7 +103,7 @@ We create the complementary :term:`dictionary` named :file:`dict/01-function.yml .. code-block:: yaml --- - version: '1.0' + version: '1.1' my_variable_jinja: type: "string" default: @@ -141,7 +141,6 @@ Let's execute `script.py`: The value of the `my_variable_extra` variable is calculated, and it's value comes from the :func:`return_no` function. - Create your own type ---------------------- @@ -180,7 +179,7 @@ Here is a :file:`dict/00-base.yml` dictionary: .. code-block:: yaml --- - version: '1.0' + version: '1.1' var: type: lipogram @@ -191,3 +190,44 @@ Here is a :file:`dict/00-base.yml` dictionary: >>> config.option('rougail.var').value.set('I just want to add a quality string that has no bad characters') [...] tiramisu.error.ValueOptionError: "I just want to add a quality string that has no bad characters" is an invalid lipogram for "var", Perec wrote a book without any "e", you could not do it in a simple sentence? + +Upgrade dictionnaries to upper version +---------------------------------------- + +All dictionnaries has a format version number. +When a new format version is proposed, it is possible to automatically convert the files to the new version. + +We create a term:`dictionary` named :file:`dict/01-upgrade.yml` with version 1.0: + +.. code-block:: yaml + + --- + version: '1.1' + my_variable: + multi: true + my_dyn_family: + type: "dynamic" + variable: my_variable + a_variable: + + +.. code-block:: python + >>> from rougail import RougailUpgrade, RougailConfig + >>> RougailConfig['dictionaries_dir'] = ['dict'] + >>> upgrade = RougailUpgrade() + >>> upgrade.load_dictionaries('dict_converted') + +The term:`dictionary` named :file:`dict_converted/01-upgrade.yml` is in version 1.1: + +.. code-block:: yaml + + version: '1.1' + my_variable: + multi: true + my_dyn_family: + type: dynamic + a_variable: null + dynamic: + type: variable + variable: my_variable + propertyerror: false diff --git a/docs/tutorial.rst b/docs/tutorial.rst index 50a5dec3e..c1941368f 100644 --- a/docs/tutorial.rst +++ b/docs/tutorial.rst @@ -35,7 +35,7 @@ Then let's put our first dictionary file in this folder, named :file:`00-proxy.y :linenos: --- - version: '1.0' + version: '1.1' proxy: description: Proxy configuration in order to have access to the internet type: family @@ -69,7 +69,7 @@ Let's create a second :file:`dict/01-proxy_mode.yml` file. :linenos: --- - version: '1.0' + version: '1.1' proxy: proxy_mode: description: Proxy mode @@ -122,7 +122,7 @@ Let's create the :file:`dict/02-proxy_manual.yml` dictionary: :caption: the the :file:`dict/02-proxy_manual.yml` file --- - version: '1.0' + version: '1.1' proxy: manual: description: Manual proxy configuration @@ -170,7 +170,7 @@ Let's create the :file:`dict/03-proxy_manual_http_proxy.yml` dictionary: :linenos: --- - version: '1.0' + version: '1.1' proxy: manual: http_proxy: @@ -195,7 +195,7 @@ We then want to offer the user the possibility of providing the same proxy for t .. code-block:: yaml :caption: the :file:`dict/04-proxy_manual_http_use_for_https.yml` file - version: '1.0' + version: '1.1' proxy: manual: use_for_https: @@ -216,7 +216,7 @@ Let's create the :file:`dict/05-proxy_manual_ssl_proxy.yml` file: :linenos: --- - version: '1.0' + version: '1.1' proxy: manual: ssl_proxy: @@ -360,7 +360,7 @@ Let's create the :file:`dict/06-proxy_manual_socks_proxy.yml` file: :caption: the :file:`dict/06-proxy_manual_socks_proxy.yml` file --- - version: '1.0' + version: '1.1' proxy: manual: socks_proxy: @@ -392,7 +392,7 @@ Let's create the :file:`dict/07-proxy_auto.yml` file: :caption: the :file:`dict/07-proxy_auto.yml` file --- - version: '1.0' + version: '1.1' proxy: auto: type: web_address @@ -419,7 +419,7 @@ Let's create the :file:`dict/07-proxy_no_proxy.yml` file: :linenos: --- - version: '1.0' + version: '1.1' proxy: no_proxy: description: Address for which proxy will be desactivated @@ -510,7 +510,7 @@ Nothing special when creating the authentication request. To do this, let's crea :linenos: --- - version: '1.0' + version: '1.1' proxy: prompt_authentication: description: Prompt for authentication if password is saved @@ -535,7 +535,7 @@ Let's create a `dict/09-proxy_proxy_dns_socks5.yml` file: :linenos: --- - version: '1.0' + version: '1.1' proxy: proxy_dns_socks5: description: Use proxy DNS when using SOCKS v5 @@ -578,7 +578,7 @@ Let's create a `dict/10-proxy_dns_over_https.yml` file: :linenos: --- - version: '1.0' + version: '1.1' proxy: dns_over_https: description: DNS over HTTPS @@ -651,7 +651,7 @@ Here is the complete content of the FoxyProxy type proxy configuration :linenos: --- - version: '1.0' + version: '1.1' proxy: _type: leadership title: @@ -813,7 +813,7 @@ If you prefer this option, here is a second extra dictionary :file:`foxyproxy/01 :linenos: --- - version: '1.0' + version: '1.1' proxy: username: redefine: true diff --git a/src/rougail/annotator/family.py b/src/rougail/annotator/family.py index bebf2228e..ca3aded6c 100644 --- a/src/rougail/annotator/family.py +++ b/src/rougail/annotator/family.py @@ -70,7 +70,6 @@ class Annotator(Walk): self.remove_empty_families() self.family_names() self.change_modes() - self.dynamic_families() self.convert_help() def remove_empty_families(self) -> None: @@ -299,33 +298,6 @@ class Annotator(Walk): if not variable.mode: variable.mode = variable_mode - def dynamic_families(self): - """link dynamic families to object""" - for family in self.get_families(): - if family.type != "dynamic": - continue - try: - family.variable = self.objectspace.paths[family.variable] - except AttributeError as err: - raise Exception( - f'cannot load the dynamic family "{family.path}", cannot find variable "{family.variable}"' - ) - if not family.variable.multi: - msg = _( - f'dynamic family "{family.name}" must be linked ' - f"to multi variable" - ) - raise DictConsistencyError(msg, 16, family.xmlfiles) - for variable in self.objectspace.parents[family.path]: - if ( - isinstance(variable, self.objectspace.family) - and not variable.leadership - ): - msg = _( - f'dynamic family "{family.name}" cannot contains another family' - ) - raise DictConsistencyError(msg, 22, family.xmlfiles) - def convert_help(self): """Convert variable help""" for family in self.get_families(): diff --git a/src/rougail/convert.py b/src/rougail/convert.py index d6732705e..d98f76d03 100644 --- a/src/rougail/convert.py +++ b/src/rougail/convert.py @@ -232,6 +232,8 @@ class ParserVariable: self.default_multi = {} self.jinja = {} self.rougailconfig = rougailconfig + self.convert_options = list(CONVERT_OPTION) + self.convert_options.extend(self.rougailconfig["custom_types"]) # self.family = Family self.dynamic = Dynamic @@ -247,11 +249,10 @@ class ParserVariable: super().__init__() def get_variable(self): - convert_options = list(CONVERT_OPTION) - convert_options.extend(self.rougailconfig["custom_types"]) class Variable(_Variable): - type: Literal[*convert_options] = convert_options[0] + #type: Literal[*convert_options] = convert_options[0] + type: str = self.convert_options[0] return Variable @@ -269,7 +270,8 @@ class ParserVariable: ) # hint = get_type_hints(self.variable) - self.variable_types = hint["type"].__args__ # pylint: disable=W0201 + + self.variable_types = self.convert_options #hint["type"].__args__ # pylint: disable=W0201 # hint = get_type_hints(self.choice) self.choice_attrs = frozenset( # pylint: disable=W0201 @@ -346,6 +348,8 @@ class ParserVariable: name: str, subpath: str, obj: dict, + version: str, + *, first_variable: bool = False, family_is_leadership: bool = False, family_is_dynamic: bool = False, @@ -368,9 +372,10 @@ class ParserVariable: name, path, obj, - first_variable, - family_is_leadership, - family_is_dynamic, + version, + first_variable=first_variable, + family_is_leadership=family_is_leadership, + family_is_dynamic=family_is_dynamic, ) def parse_family( @@ -379,6 +384,8 @@ class ParserVariable: name: str, path: str, obj: Optional[Dict[str, Any]], + version: str, + *, first_variable: bool = False, family_is_leadership: bool = False, family_is_dynamic: bool = False, @@ -429,6 +436,7 @@ class ParserVariable: family_obj, filename, family_is_dynamic, + version, ) force_not_first = False if self.paths[path].type == "leadership": @@ -447,9 +455,10 @@ class ParserVariable: key, path, value, - first_variable, - family_is_leadership, - family_is_dynamic, + version, + first_variable=first_variable, + family_is_leadership=family_is_leadership, + family_is_dynamic=family_is_dynamic, ) def list_attributes( @@ -487,6 +496,7 @@ class ParserVariable: family: dict, filenames: Union[str, List[str]], family_is_dynamic: bool, + version: str, ) -> None: """Add a new family""" family["path"] = path @@ -496,11 +506,15 @@ class ParserVariable: obj_type = self.get_family_or_variable_type(family) if obj_type == "dynamic": family_obj = self.dynamic + if version == "1.0": + if family["variable"] is None: + raise Exception(f'dynamic family must have "variable" attribute for "{family["path"]}" in {family["xmlfiles"]}') + family["dynamic"] = {'type': 'variable', + 'variable': family.pop("variable"), + 'propertyerror': False, + } if "variable" in family: - family["variable"] = get_realpath( - family["variable"], - self.path_prefix, - ) + raise Exception(f'dynamic family must not have "variable" attribute for "{family["path"]}" in {family["xmlfiles"]}') else: family_obj = self.family # convert to Calculation objects @@ -549,6 +563,8 @@ class ParserVariable: name: str, path: str, obj: Optional[Dict[str, Any]], + version: str, + *, first_variable: bool = False, family_is_leadership: bool = False, family_is_dynamic: bool = False, @@ -795,7 +811,7 @@ class ParserVariable: class RougailConvert(ParserVariable): """Main Rougail conversion""" - supported_version = ["1.0"] + supported_version = ["1.0", "1.1"] def __init__(self, rougailconfig) -> None: self.annotator = False @@ -845,6 +861,7 @@ class RougailConvert(ParserVariable): {}, "", False, + None, ) else: root_parent = "." @@ -882,7 +899,7 @@ class RougailConvert(ParserVariable): """Parse file""" with open(filename, encoding="utf8") as file_fh: objects = safe_load(file_fh) - self.validate_file_version( + version = self.validate_file_version( objects, filename, ) @@ -891,6 +908,7 @@ class RougailConvert(ParserVariable): namespace, path, {}, + version, ) for name, obj in objects.items(): self.family_or_variable( @@ -898,6 +916,7 @@ class RougailConvert(ParserVariable): name, path, obj, + version, ) def get_sorted_filename( @@ -933,11 +952,12 @@ class RougailConvert(ParserVariable): """version is mandatory in YAML file""" if "version" not in obj: raise Exception(f'"version" attribut is mandatory in yaml file {filename}') - version = obj.pop("version") + version = str(obj.pop("version")) if version not in self.supported_version: raise Exception( f"pffff version ... {version} not in {self.supported_version}" ) + return version def annotate( self, diff --git a/src/rougail/error.py b/src/rougail/error.py index 178370c58..1449e23f3 100644 --- a/src/rougail/error.py +++ b/src/rougail/error.py @@ -73,3 +73,15 @@ class DictConsistencyError(Exception): class UpgradeError(Exception): """Error during XML upgrade""" + +## ---- generic exceptions ---- + +class NotFoundError(Exception): + "not found error" + pass + +class VariableNotFoundError(NotFoundError): + "Variable was not found" + def __init__(self, errmsg, varname): + self.varname = varname + diff --git a/src/rougail/object_model.py b/src/rougail/object_model.py index 6e51c9a61..42816d6a6 100644 --- a/src/rougail/object_model.py +++ b/src/rougail/object_model.py @@ -30,7 +30,7 @@ from pydantic import ( ConfigDict, ) from .utils import get_jinja_variable_to_param, get_realpath - +from .error import VariableNotFoundError BASETYPE = Union[StrictBool, StrictInt, StrictFloat, StrictStr, None] @@ -174,7 +174,7 @@ class Calculation(BaseModel): class JinjaCalculation(Calculation): attribute_name: Literal[ - "frozen", "hidden", "mandatory", "disabled", "default", "validators", "choices" + "frozen", "hidden", "mandatory", "disabled", "default", "validators", "choices", "dynamic" ] jinja: StrictStr params: Optional[List[Param]] = None @@ -279,12 +279,19 @@ class JinjaCalculation(Calculation): not self.inside_list, objectspace, ) + elif self.attribute_name == "dynamic": + return self._jinja_to_function( + "jinja_to_function", + "string", + True, + objectspace, + ) raise Exception("hu?") class VariableCalculation(Calculation): attribute_name: Literal[ - "frozen", "hidden", "mandatory", "disabled", "default", "choices" + "frozen", "hidden", "mandatory", "disabled", "default", "choices", "dynamic" ] variable: StrictStr propertyerror: bool = True @@ -296,8 +303,9 @@ class VariableCalculation(Calculation): variable_path = self.get_realpath(self.variable) variable, suffix, dynamic = objectspace.paths.get_with_dynamic(variable_path) if not variable: - raise Exception(f"pffff {variable_path}") + raise VariableNotFoundError(f"Variable not found {variable_path}", variable_path) if not isinstance(variable, objectspace.variable): + # FIXME remove the pfff raise Exception("pfff it's a family") param = { "type": "variable", @@ -410,7 +418,8 @@ class Family(BaseModel): class Dynamic(Family): - variable: str + variable: str=None + dynamic: Optional[BASETYPE_CALC] class _Variable(BaseModel): diff --git a/src/rougail/tiramisureflector.py b/src/rougail/tiramisureflector.py index d24a7dc93..a03de68f3 100644 --- a/src/rougail/tiramisureflector.py +++ b/src/rougail/tiramisureflector.py @@ -33,7 +33,7 @@ from json import dumps from os.path import isfile, basename from .i18n import _ -from .error import DictConsistencyError +from .error import DictConsistencyError, VariableNotFoundError from .utils import normalize_family from .object_model import Calculation, CONVERT_OPTION @@ -571,24 +571,23 @@ class Family(Common): keys: list, ) -> None: if self.elt.type == "dynamic": - dyn = self.tiramisu.reflector_objects[self.elt.variable.path].get( - self.calls, self.elt.path - ) - keys[ - "suffixes" - ] = f"Calculation(func['calc_value'], Params((ParamOption({dyn}, notraisepropertyerror=True))))" + keys["suffixes"] = self.calculation_value(self.elt.dynamic) children = [] for path in self.objectspace.parents[self.elt.path]: children.append(self.objectspace.paths[path]) - keys["children"] = ( - "[" - + ", ".join( - [ - self.tiramisu.reflector_objects[child.path].get( - self.calls, self.elt.path - ) - for child in children - ] + try: + keys["children"] = ( + "[" + + ", ".join( + [ + self.tiramisu.reflector_objects[child.path].get( + self.calls, self.elt.path + ) + for child in children + ] + ) + + "]" ) - + "]" - ) + except VariableNotFoundError as exc: + msg = f"The variable '{exc.varname}' is mandatory for the dynamic family" + raise DictConsistencyError(msg, 88, self.elt.xmlfiles) diff --git a/src/rougail/update.py b/src/rougail/update.py index 33c6e56d4..80494cf6f 100644 --- a/src/rougail/update.py +++ b/src/rougail/update.py @@ -26,6 +26,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA from typing import List, Any, Optional, Tuple from os.path import join, isfile, isdir, basename from os import listdir, makedirs + try: from lxml.etree import parse, XMLParser, XMLSyntaxError # pylint: disable=E0611 from lxml.etree import Element, SubElement, tostring @@ -45,16 +46,7 @@ from .config import RougailConfig from .object_model import CONVERT_OPTION -VERSIONS = ["0.10", "1.0"] - -FIXME_PRINT_FILENAME = True -FIXME_PRINT_FILENAME = False -FIXME_PRINT_FILE = True -FIXME_PRINT_FILE = False -FIXME_PRINT_UNKNOWN_VAR = True -FIXME_PRINT_UNKNOWN_VAR = False -FIXME_PRINT_REMOVE = True -FIXME_PRINT_REMOVE = False +VERSIONS = ["0.10", "1.0", "1.1"] def get_function_name(version): @@ -70,17 +62,13 @@ class NoAliasDumper(SafeDumper): return True -class upgrade_010_to_100: +class upgrade_010_to_10: def __init__( self, dico: dict, namespace: str, xmlsrc: str, ) -> None: - if FIXME_PRINT_FILE: - from pprint import pprint - - pprint(dico) self.xmlsrc = xmlsrc self.paths = {"family": {}, "variable": {}} self.lists = { @@ -94,10 +82,6 @@ class upgrade_010_to_100: self.parse_variables_with_path() self.parse_services(dico) self.parse_constraints(dico) - if FIXME_PRINT_FILE: - print("==") - pprint(self.variables) - pprint(self.services) def parse_variables( self, @@ -159,13 +143,14 @@ class upgrade_010_to_100: new_families[name] = variable self.flatten_paths["variable"][name] = sub_path self.paths["variable"][sub_path] = variable - if "redefine" not in variable and "value" not in variable and "mandatory" not in variable and ("type" not in variable or variable["type"] != "boolean"): + if ( + "redefine" not in variable + and "value" not in variable + and "mandatory" not in variable + and ("type" not in variable or variable["type"] != "boolean") + ): variable["mandatory"] = False if "remove_condition" in variable and variable.pop("remove_condition"): - if FIXME_PRINT_REMOVE: - print( - f"variable {name} in file {self.xmlsrc} has remove_condition, all properties (hidden, disabled and mandatory) are set to False" - ) for prop in ["hidden", "disabled", "mandatory"]: if prop not in variable: variable[prop] = False @@ -334,27 +319,19 @@ class upgrade_010_to_100: condition_value = True else: condition_value = self.params_condition_to_jinja( - source, condition["param"], name.endswith("if_in") + prop, source, condition["param"], name.endswith("if_in") ) for target in condition["target"]: typ = target.get("type", "variable") if typ == "variable": variable_path = self.get_variable_path(target["text"]) if variable_path is None: - if FIXME_PRINT_UNKNOWN_VAR and not target.get("optional", False): - print( - f'pffff la target {target["text"]} de la condition n\'est pas trouvable' - ) continue variable = self.paths["variable"][variable_path] variable[prop] = condition_value elif typ == "family": family_path = self.get_family_path(target["text"]) if family_path is None: - if FIXME_PRINT_UNKNOWN_VAR and not target.get("optional", False): - print( - f'pffff la target {target["text"]} de la condition n\'est pas trouvable' - ) continue family = self.paths["family"][family_path] family[prop] = condition_value @@ -386,10 +363,6 @@ class upgrade_010_to_100: for target in check["target"]: variable_path = self.get_variable_path(target["text"]) if variable_path is None: - if FIXME_PRINT_UNKNOWN_VAR and not target.get("optional", False): - print( - f'pffff la target {target["text"]} dans le check n\'est pas trouvable' - ) continue variable = self.paths["variable"][variable_path] if "validators" in variable and variable["validators"] is None: @@ -411,10 +384,6 @@ class upgrade_010_to_100: params = [] variable_path = self.get_variable_path(target["text"]) if variable_path is None: - if FIXME_PRINT_UNKNOWN_VAR and not target.get("optional", False): - print( - f'pffff la target {target["text"]} dans le fill n\'est pas trouvable' - ) continue variable = self.paths["variable"][variable_path] if fill.get("type") == "jinja": @@ -428,6 +397,7 @@ class upgrade_010_to_100: def params_condition_to_jinja( self, + prop: str, path: str, params: List[dict], if_in: bool, @@ -444,9 +414,9 @@ class upgrade_010_to_100: if new_param: new_params |= new_param if if_in: - jinja += " %}true{% else %}false{% endif %}" + jinja += " %}" + prop + "{% endif %}" else: - jinja += " %}false{% else %}true{% endif %}" + jinja += " %}{% else %}" + prop + "{% endif %}" ret = { "type": "jinja", "jinja": jinja, @@ -459,11 +429,9 @@ class upgrade_010_to_100: self, param: dict, ) -> Any: - # typ = param.get("type", "string") if typ == "string": value = param["text"] - # value = dumps(value, ensure_ascii=False) elif typ == "number": value = int(param["text"]) elif typ == "nil": @@ -551,7 +519,6 @@ class upgrade_010_to_100: new_param, value = self.get_jinja_param_and_value(param) if new_param: params |= new_param - # if param.get('type') != 'variable' or value is not None: if "name" in param: values.append(f'{param["name"]}={value}') else: @@ -577,8 +544,6 @@ class upgrade_010_to_100: ): path = self.flatten_paths["variable"][path] if path not in self.paths["variable"]: - if FIXME_PRINT_UNKNOWN_VAR: - print("pffff impossible de trouver la variable", path) return return path @@ -589,8 +554,6 @@ class upgrade_010_to_100: if path not in self.paths["family"] and path in self.flatten_paths["family"]: path = self.flatten_paths["family"][path] if path not in self.paths["family"]: - if FIXME_PRINT_UNKNOWN_VAR: - print("pffff impossible de trouver la famille", path) return return path @@ -615,21 +578,22 @@ class RougailUpgrade: def load_dictionaries( self, - # srcfolder: str, dstfolder: str, - services_dstfolder: Optional[str], + services_dstfolder: Optional[str] = None, extra_dstfolder: Optional[str] = None, - # namespace: str, - # display: bool=True, ): if extra_dstfolder is None: extra_dstfolder = dstfolder - self._load_dictionaries( - self.rougailconfig["dictionaries_dir"], - dstfolder, - services_dstfolder, - self.rougailconfig["variable_namespace"], - ) + dict_dirs = self.rougailconfig["dictionaries_dir"] + if not isinstance(dict_dirs, list): + dict_dirs = [dict_dirs] + for dict_dir in dict_dirs: + self._load_dictionaries( + dict_dir, + dstfolder, + services_dstfolder, + self.rougailconfig["variable_namespace"], + ) for namespace, extra_dirs in self.rougailconfig["extra_dictionaries"].items(): extra_dstsubfolder = join(extra_dstfolder, namespace) if not isdir(extra_dstsubfolder): @@ -671,7 +635,7 @@ class RougailUpgrade: ) if filename.endswith(".xml"): if parse is None: - raise Exception('XML module is not installed') + raise Exception("XML module is not installed") try: parser = XMLParser(remove_blank_text=True) document = parse(xmlsrc, parser) @@ -685,29 +649,22 @@ class RougailUpgrade: else: with xmlsrc.open() as xml_fh: root = safe_load(xml_fh) - search_function_name = get_function_name(root["version"]) + search_function_name = get_function_name(str(root["version"])) ext = "yml" function_found = False - if FIXME_PRINT_FILENAME: - print( - "========================================================================" - ) - print(xmlsrc) - print( - "========================================================================" - ) + root_services = None for version, function_version in FUNCTION_VERSIONS: if function_found and hasattr(self, function_version): - # if display: - # print(f' - convert {filename} to version {version}') upgrade_help = self.upgrade_help.get(function_version, {}).get( filename, {} ) if upgrade_help.get("remove") is True: continue - root, root_services, new_type = getattr(self, function_version)( + root, root_services_, new_type = getattr(self, function_version)( root, upgrade_help, namespace, xmlsrc, ext ) + if root_services_ is not None: + root_services = root_services_ if function_version == search_function_name: function_found = True if root: @@ -733,12 +690,6 @@ class RougailUpgrade: Dumper=NoAliasDumper, ) - # if not self.dtd.validate(document): - # dtd_error = self.dtd.error_log.filter_from_errors()[0] - # msg = _(f'not a valid XML file: {dtd_error}') - # raise DictConsistencyError(msg, 43, [xmlfile]) - # yield xmlfile, document.getroot() - def _attribut_to_bool(self, variable): for prop in [ "mandatory", @@ -766,10 +717,11 @@ class RougailUpgrade: def _attribut_to_int(self, variable): for prop in ["mode"]: if prop in variable: - if variable[prop] in ['expert', 'normal']: - variable[prop] = {'expert': 'advanced', - 'normal': 'standard', - }.get(variable[prop]) + if variable[prop] in ["expert", "normal"]: + variable[prop] = { + "expert": "advanced", + "normal": "standard", + }.get(variable[prop]) continue try: variable[prop] = int(variable[prop]) @@ -891,6 +843,36 @@ class RougailUpgrade: dico = {obj_name: dico} return dico + def _update_1_1(self, root): + if not isinstance(root, dict): + return + # migrate dynamic family + if ( + ("variable" in root and isinstance(root["variable"], str)) + or ("_variable" in root and isinstance(root["_variable"], str)) + ) and ( + ("_type" in root and root["_type"] == "dynamic") + or ("type" in root and root["type"] == "dynamic") + ): + root["dynamic"] = { + "type": "variable", + "variable": root.pop("variable"), + "propertyerror": False, + } + for key, value in root.items(): + self._update_1_1(value) + + def update_1_1( + self, + root, + upgrade_help: dict, + namespace: str, + xmlsrc: str, + ext: str, + ): + self._update_1_1(root) + return root, None, "yml" + def update_1_0( self, root: "Element", @@ -909,19 +891,9 @@ class RougailUpgrade: new_objects = self._xml_to_yaml(objects, typ, variables, "") if new_objects[typ]: new_root.update(new_objects) - # services = root.find('services') - # if services is None: - # services = [] - # new_services = self._xml_to_yaml_service(services) - # if new_services: - # new_root['services'] = new_services - # paths = self._get_path_variables(variables, - # namespace == 'configuration', - # namespace, - # ) else: new_root = root - variables, services = upgrade_010_to_100(new_root, namespace, xmlsrc).get() + variables, services = upgrade_010_to_10(new_root, namespace, xmlsrc).get() return variables, services, "yml" def update_0_10( diff --git a/tests/dictionaries/20family_dynamic/dictionaries/rougail/00-base.yml b/tests/dictionaries/20family_dynamic/dictionaries/rougail/00-base.yml index dc718dd89..11cc3a79b 100644 --- a/tests/dictionaries/20family_dynamic/dictionaries/rougail/00-base.yml +++ b/tests/dictionaries/20family_dynamic/dictionaries/rougail/00-base.yml @@ -8,9 +8,12 @@ general: - val2 dyn: type: dynamic - variable: rougail.general.varname + dynamic: + type: variable + variable: rougail.general.varname + propertyerror: false vardyn: type: string description: No change mandatory: false -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries/20family_dynamic/tiramisu/base.py b/tests/dictionaries/20family_dynamic/tiramisu/base.py index 24f1fbf12..0f81ded40 100644 --- a/tests/dictionaries/20family_dynamic/tiramisu/base.py +++ b/tests/dictionaries/20family_dynamic/tiramisu/base.py @@ -19,7 +19,54 @@ def _load_functions(path): continue func[function] = getattr(func_, function) _load_functions('tests/dictionaries/../eosfunc/test.py') +from jinja2 import StrictUndefined, DictLoader +from jinja2.sandbox import SandboxedEnvironment +from rougail.annotator.variable import CONVERT_OPTION +from tiramisu.error import ValueWarning +def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): + global ENV, CONVERT_OPTION + kw = {} + for key, value in kwargs.items(): + if '.' in key: + c_kw = kw + path, var = key.rsplit('.', 1) + for subkey in path.split('.'): + c_kw = c_kw.setdefault(subkey, {}) + c_kw[var] = value + else: + kw[key] = value + values = ENV.get_template(__internal_jinja).render(kw, **func).strip() + convert = CONVERT_OPTION[__internal_type].get('func', str) + if __internal_multi: + return [convert(val) for val in values.split()] + values = convert(values) + return values if values != '' and values != 'None' else None +def variable_to_property(prop, value): + return prop if value else None +def jinja_to_property(prop, **kwargs): + value = func['jinja_to_function'](**kwargs) + return func['variable_to_property'](prop, value is not None) +def jinja_to_property_help(prop, **kwargs): + value = func['jinja_to_function'](**kwargs) + return (prop, f'"{prop}" ({value})') +def valid_with_jinja(warnings_only=False, **kwargs): + global ValueWarning + value = func['jinja_to_function'](**kwargs) + if value: + if warnings_only: + raise ValueWarning(value) + else: + raise ValueError(value) +func['jinja_to_function'] = jinja_to_function +func['jinja_to_property'] = jinja_to_property +func['jinja_to_property_help'] = jinja_to_property_help +func['variable_to_property'] = variable_to_property +func['valid_with_jinja'] = valid_with_jinja +dict_env = {} from rougail.tiramisu import ConvertDynOptionDescription +ENV = SandboxedEnvironment(loader=DictLoader(dict_env), undefined=StrictUndefined) +ENV.filters = func +ENV.compile_templates('jinja_caches', zip=None) option_3 = StrOption(name="varname", doc="No change", multi=True, default=["val1", "val2"], default_multi="val1", properties=frozenset({"mandatory", "notempty", "standard"})) optiondescription_2 = OptionDescription(name="general", doc="general", children=[option_3], properties=frozenset({"standard"})) option_5 = StrOption(name="vardyn", doc="No change", properties=frozenset({"standard"})) diff --git a/tests/dictionaries/20family_dynamic/tiramisu/multi.py b/tests/dictionaries/20family_dynamic/tiramisu/multi.py index 0ed4789c3..0342b0d1a 100644 --- a/tests/dictionaries/20family_dynamic/tiramisu/multi.py +++ b/tests/dictionaries/20family_dynamic/tiramisu/multi.py @@ -19,7 +19,54 @@ def _load_functions(path): continue func[function] = getattr(func_, function) _load_functions('tests/dictionaries/../eosfunc/test.py') +from jinja2 import StrictUndefined, DictLoader +from jinja2.sandbox import SandboxedEnvironment +from rougail.annotator.variable import CONVERT_OPTION +from tiramisu.error import ValueWarning +def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): + global ENV, CONVERT_OPTION + kw = {} + for key, value in kwargs.items(): + if '.' in key: + c_kw = kw + path, var = key.rsplit('.', 1) + for subkey in path.split('.'): + c_kw = c_kw.setdefault(subkey, {}) + c_kw[var] = value + else: + kw[key] = value + values = ENV.get_template(__internal_jinja).render(kw, **func).strip() + convert = CONVERT_OPTION[__internal_type].get('func', str) + if __internal_multi: + return [convert(val) for val in values.split()] + values = convert(values) + return values if values != '' and values != 'None' else None +def variable_to_property(prop, value): + return prop if value else None +def jinja_to_property(prop, **kwargs): + value = func['jinja_to_function'](**kwargs) + return func['variable_to_property'](prop, value is not None) +def jinja_to_property_help(prop, **kwargs): + value = func['jinja_to_function'](**kwargs) + return (prop, f'"{prop}" ({value})') +def valid_with_jinja(warnings_only=False, **kwargs): + global ValueWarning + value = func['jinja_to_function'](**kwargs) + if value: + if warnings_only: + raise ValueWarning(value) + else: + raise ValueError(value) +func['jinja_to_function'] = jinja_to_function +func['jinja_to_property'] = jinja_to_property +func['jinja_to_property_help'] = jinja_to_property_help +func['variable_to_property'] = variable_to_property +func['valid_with_jinja'] = valid_with_jinja +dict_env = {} from rougail.tiramisu import ConvertDynOptionDescription +ENV = SandboxedEnvironment(loader=DictLoader(dict_env), undefined=StrictUndefined) +ENV.filters = func +ENV.compile_templates('jinja_caches', zip=None) option_4 = StrOption(name="varname", doc="No change", multi=True, default=["val1", "val2"], default_multi="val1", properties=frozenset({"mandatory", "notempty", "standard"})) optiondescription_3 = OptionDescription(name="general", doc="general", children=[option_4], properties=frozenset({"standard"})) option_6 = StrOption(name="vardyn", doc="No change", properties=frozenset({"standard"})) diff --git a/tests/dictionaries/20family_dynamic_1.1/__init__.py b/tests/dictionaries/20family_dynamic_1.1/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/tests/dictionaries/20family_dynamic_1.1/dictionaries/rougail/00-base.yml b/tests/dictionaries/20family_dynamic_1.1/dictionaries/rougail/00-base.yml new file mode 100644 index 000000000..dc718dd89 --- /dev/null +++ b/tests/dictionaries/20family_dynamic_1.1/dictionaries/rougail/00-base.yml @@ -0,0 +1,16 @@ +general: + varname: + type: string + description: No change + multi: true + default: + - val1 + - val2 +dyn: + type: dynamic + variable: rougail.general.varname + vardyn: + type: string + description: No change + mandatory: false +version: '1.0' diff --git a/tests/dictionaries/20family_dynamic_1.1/makedict/after.json b/tests/dictionaries/20family_dynamic_1.1/makedict/after.json new file mode 100644 index 000000000..cfa084ee8 --- /dev/null +++ b/tests/dictionaries/20family_dynamic_1.1/makedict/after.json @@ -0,0 +1,17 @@ +{ + "rougail.general.varname": { + "owner": "default", + "value": [ + "val1", + "val2" + ] + }, + "rougail.dynval1.vardyn": { + "owner": "default", + "value": null + }, + "rougail.dynval2.vardyn": { + "owner": "default", + "value": null + } +} diff --git a/tests/dictionaries/20family_dynamic_1.1/makedict/base.json b/tests/dictionaries/20family_dynamic_1.1/makedict/base.json new file mode 100644 index 000000000..4db75edda --- /dev/null +++ b/tests/dictionaries/20family_dynamic_1.1/makedict/base.json @@ -0,0 +1,8 @@ +{ + "rougail.general.varname": [ + "val1", + "val2" + ], + "rougail.dynval1.vardyn": null, + "rougail.dynval2.vardyn": null +} diff --git a/tests/dictionaries/20family_dynamic_1.1/makedict/before.json b/tests/dictionaries/20family_dynamic_1.1/makedict/before.json new file mode 100644 index 000000000..cfa084ee8 --- /dev/null +++ b/tests/dictionaries/20family_dynamic_1.1/makedict/before.json @@ -0,0 +1,17 @@ +{ + "rougail.general.varname": { + "owner": "default", + "value": [ + "val1", + "val2" + ] + }, + "rougail.dynval1.vardyn": { + "owner": "default", + "value": null + }, + "rougail.dynval2.vardyn": { + "owner": "default", + "value": null + } +} diff --git a/tests/dictionaries/20family_dynamic_1.1/tiramisu/base.py b/tests/dictionaries/20family_dynamic_1.1/tiramisu/base.py new file mode 100644 index 000000000..0f81ded40 --- /dev/null +++ b/tests/dictionaries/20family_dynamic_1.1/tiramisu/base.py @@ -0,0 +1,75 @@ +from tiramisu import * +from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("standard") +ALLOWED_LEADER_PROPERTIES.add("advanced") +from importlib.machinery import SourceFileLoader as _SourceFileLoader +from importlib.util import spec_from_loader as _spec_from_loader, module_from_spec as _module_from_spec +global func +func = {'calc_value': calc_value} + +def _load_functions(path): + global _SourceFileLoader, _spec_from_loader, _module_from_spec, func + loader = _SourceFileLoader('func', path) + spec = _spec_from_loader(loader.name, loader) + func_ = _module_from_spec(spec) + loader.exec_module(func_) + for function in dir(func_): + if function.startswith('_'): + continue + func[function] = getattr(func_, function) +_load_functions('tests/dictionaries/../eosfunc/test.py') +from jinja2 import StrictUndefined, DictLoader +from jinja2.sandbox import SandboxedEnvironment +from rougail.annotator.variable import CONVERT_OPTION +from tiramisu.error import ValueWarning +def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): + global ENV, CONVERT_OPTION + kw = {} + for key, value in kwargs.items(): + if '.' in key: + c_kw = kw + path, var = key.rsplit('.', 1) + for subkey in path.split('.'): + c_kw = c_kw.setdefault(subkey, {}) + c_kw[var] = value + else: + kw[key] = value + values = ENV.get_template(__internal_jinja).render(kw, **func).strip() + convert = CONVERT_OPTION[__internal_type].get('func', str) + if __internal_multi: + return [convert(val) for val in values.split()] + values = convert(values) + return values if values != '' and values != 'None' else None +def variable_to_property(prop, value): + return prop if value else None +def jinja_to_property(prop, **kwargs): + value = func['jinja_to_function'](**kwargs) + return func['variable_to_property'](prop, value is not None) +def jinja_to_property_help(prop, **kwargs): + value = func['jinja_to_function'](**kwargs) + return (prop, f'"{prop}" ({value})') +def valid_with_jinja(warnings_only=False, **kwargs): + global ValueWarning + value = func['jinja_to_function'](**kwargs) + if value: + if warnings_only: + raise ValueWarning(value) + else: + raise ValueError(value) +func['jinja_to_function'] = jinja_to_function +func['jinja_to_property'] = jinja_to_property +func['jinja_to_property_help'] = jinja_to_property_help +func['variable_to_property'] = variable_to_property +func['valid_with_jinja'] = valid_with_jinja +dict_env = {} +from rougail.tiramisu import ConvertDynOptionDescription +ENV = SandboxedEnvironment(loader=DictLoader(dict_env), undefined=StrictUndefined) +ENV.filters = func +ENV.compile_templates('jinja_caches', zip=None) +option_3 = StrOption(name="varname", doc="No change", multi=True, default=["val1", "val2"], default_multi="val1", properties=frozenset({"mandatory", "notempty", "standard"})) +optiondescription_2 = OptionDescription(name="general", doc="general", children=[option_3], properties=frozenset({"standard"})) +option_5 = StrOption(name="vardyn", doc="No change", properties=frozenset({"standard"})) +optiondescription_4 = ConvertDynOptionDescription(name="dyn", doc="dyn", suffixes=Calculation(func['calc_value'], Params((ParamOption(option_3, notraisepropertyerror=True)))), children=[option_5], properties=frozenset({"standard"})) +optiondescription_1 = OptionDescription(name="rougail", doc="rougail", children=[optiondescription_2, optiondescription_4], properties=frozenset({"standard"})) +option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1]) diff --git a/tests/dictionaries/20family_dynamic_1.1/tiramisu/multi.py b/tests/dictionaries/20family_dynamic_1.1/tiramisu/multi.py new file mode 100644 index 000000000..0342b0d1a --- /dev/null +++ b/tests/dictionaries/20family_dynamic_1.1/tiramisu/multi.py @@ -0,0 +1,82 @@ +from tiramisu import * +from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("standard") +ALLOWED_LEADER_PROPERTIES.add("advanced") +from importlib.machinery import SourceFileLoader as _SourceFileLoader +from importlib.util import spec_from_loader as _spec_from_loader, module_from_spec as _module_from_spec +global func +func = {'calc_value': calc_value} + +def _load_functions(path): + global _SourceFileLoader, _spec_from_loader, _module_from_spec, func + loader = _SourceFileLoader('func', path) + spec = _spec_from_loader(loader.name, loader) + func_ = _module_from_spec(spec) + loader.exec_module(func_) + for function in dir(func_): + if function.startswith('_'): + continue + func[function] = getattr(func_, function) +_load_functions('tests/dictionaries/../eosfunc/test.py') +from jinja2 import StrictUndefined, DictLoader +from jinja2.sandbox import SandboxedEnvironment +from rougail.annotator.variable import CONVERT_OPTION +from tiramisu.error import ValueWarning +def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): + global ENV, CONVERT_OPTION + kw = {} + for key, value in kwargs.items(): + if '.' in key: + c_kw = kw + path, var = key.rsplit('.', 1) + for subkey in path.split('.'): + c_kw = c_kw.setdefault(subkey, {}) + c_kw[var] = value + else: + kw[key] = value + values = ENV.get_template(__internal_jinja).render(kw, **func).strip() + convert = CONVERT_OPTION[__internal_type].get('func', str) + if __internal_multi: + return [convert(val) for val in values.split()] + values = convert(values) + return values if values != '' and values != 'None' else None +def variable_to_property(prop, value): + return prop if value else None +def jinja_to_property(prop, **kwargs): + value = func['jinja_to_function'](**kwargs) + return func['variable_to_property'](prop, value is not None) +def jinja_to_property_help(prop, **kwargs): + value = func['jinja_to_function'](**kwargs) + return (prop, f'"{prop}" ({value})') +def valid_with_jinja(warnings_only=False, **kwargs): + global ValueWarning + value = func['jinja_to_function'](**kwargs) + if value: + if warnings_only: + raise ValueWarning(value) + else: + raise ValueError(value) +func['jinja_to_function'] = jinja_to_function +func['jinja_to_property'] = jinja_to_property +func['jinja_to_property_help'] = jinja_to_property_help +func['variable_to_property'] = variable_to_property +func['valid_with_jinja'] = valid_with_jinja +dict_env = {} +from rougail.tiramisu import ConvertDynOptionDescription +ENV = SandboxedEnvironment(loader=DictLoader(dict_env), undefined=StrictUndefined) +ENV.filters = func +ENV.compile_templates('jinja_caches', zip=None) +option_4 = StrOption(name="varname", doc="No change", multi=True, default=["val1", "val2"], default_multi="val1", properties=frozenset({"mandatory", "notempty", "standard"})) +optiondescription_3 = OptionDescription(name="general", doc="general", children=[option_4], properties=frozenset({"standard"})) +option_6 = StrOption(name="vardyn", doc="No change", properties=frozenset({"standard"})) +optiondescription_5 = ConvertDynOptionDescription(name="dyn", doc="dyn", suffixes=Calculation(func['calc_value'], Params((ParamOption(option_4, notraisepropertyerror=True)))), children=[option_6], properties=frozenset({"standard"})) +optiondescription_2 = OptionDescription(name="rougail", doc="rougail", children=[optiondescription_3, optiondescription_5], properties=frozenset({"standard"})) +optiondescription_1 = OptionDescription(name="1", doc="1", children=[optiondescription_2], properties=frozenset({"standard"})) +option_10 = StrOption(name="varname", doc="No change", multi=True, default=["val1", "val2"], default_multi="val1", properties=frozenset({"mandatory", "notempty", "standard"})) +optiondescription_9 = OptionDescription(name="general", doc="general", children=[option_10], properties=frozenset({"standard"})) +option_12 = StrOption(name="vardyn", doc="No change", properties=frozenset({"standard"})) +optiondescription_11 = ConvertDynOptionDescription(name="dyn", doc="dyn", suffixes=Calculation(func['calc_value'], Params((ParamOption(option_10, notraisepropertyerror=True)))), children=[option_12], properties=frozenset({"standard"})) +optiondescription_8 = OptionDescription(name="rougail", doc="rougail", children=[optiondescription_9, optiondescription_11], properties=frozenset({"standard"})) +optiondescription_7 = OptionDescription(name="2", doc="2", children=[optiondescription_8], properties=frozenset({"standard"})) +option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1, optiondescription_7]) diff --git a/tests/dictionaries/20family_dynamic_calc/dictionaries/rougail/00-base.yml b/tests/dictionaries/20family_dynamic_calc/dictionaries/rougail/00-base.yml index 0497d168e..ea39b9735 100644 --- a/tests/dictionaries/20family_dynamic_calc/dictionaries/rougail/00-base.yml +++ b/tests/dictionaries/20family_dynamic_calc/dictionaries/rougail/00-base.yml @@ -1,5 +1,5 @@ --- -version: '1.0' +version: '1.1' general: varname: type: string @@ -10,7 +10,10 @@ general: - val2 dyn: type: dynamic - variable: rougail.general.varname + dynamic: + type: variable + variable: rougail.general.varname + propertyerror: false vardyn: type: string description: No change diff --git a/tests/dictionaries/20family_dynamic_calc2/dictionaries/rougail/00-base.yml b/tests/dictionaries/20family_dynamic_calc2/dictionaries/rougail/00-base.yml index 6d0ac3ce9..012512f0f 100644 --- a/tests/dictionaries/20family_dynamic_calc2/dictionaries/rougail/00-base.yml +++ b/tests/dictionaries/20family_dynamic_calc2/dictionaries/rougail/00-base.yml @@ -1,5 +1,5 @@ --- -version: '1.0' +version: '1.1' general: varname: multi: true @@ -8,7 +8,10 @@ general: - val2 dyn: type: dynamic - variable: rougail.general.varname + dynamic: + type: variable + variable: rougail.general.varname + propertyerror: false vardyn: type: string default: val diff --git a/tests/dictionaries/20family_dynamic_calc_suffix/dictionaries/rougail/00-base.yml b/tests/dictionaries/20family_dynamic_calc_suffix/dictionaries/rougail/00-base.yml index 3c7e7c7cb..074138ae2 100644 --- a/tests/dictionaries/20family_dynamic_calc_suffix/dictionaries/rougail/00-base.yml +++ b/tests/dictionaries/20family_dynamic_calc_suffix/dictionaries/rougail/00-base.yml @@ -1,4 +1,4 @@ -version: '1.0' +version: '1.1' general: varname: type: string @@ -9,7 +9,10 @@ general: - val2 dyn: type: dynamic - variable: rougail.general.varname + dynamic: + type: variable + variable: rougail.general.varname + propertyerror: false vardyn: type: string description: No change diff --git a/tests/dictionaries/20family_dynamic_calc_suffix_param/dictionaries/rougail/00-base.yml b/tests/dictionaries/20family_dynamic_calc_suffix_param/dictionaries/rougail/00-base.yml index c132ff993..afa7be452 100644 --- a/tests/dictionaries/20family_dynamic_calc_suffix_param/dictionaries/rougail/00-base.yml +++ b/tests/dictionaries/20family_dynamic_calc_suffix_param/dictionaries/rougail/00-base.yml @@ -8,7 +8,10 @@ general: - val2 dyn: type: dynamic - variable: rougail.general.varname + dynamic: + type: variable + variable: rougail.general.varname + propertyerror: false vardyn: type: string description: No change @@ -24,4 +27,4 @@ new: type: string description: No change mandatory: false -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries/20family_dynamic_description/dictionaries/rougail/00-base.yml b/tests/dictionaries/20family_dynamic_description/dictionaries/rougail/00-base.yml index b4cb56036..956ab2709 100644 --- a/tests/dictionaries/20family_dynamic_description/dictionaries/rougail/00-base.yml +++ b/tests/dictionaries/20family_dynamic_description/dictionaries/rougail/00-base.yml @@ -9,9 +9,12 @@ general: dyn: description: 'Dyn ' type: dynamic - variable: rougail.general.varname + dynamic: + type: variable + variable: rougail.general.varname + propertyerror: false vardyn: type: string description: No change mandatory: false -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries/20family_dynamic_description/tiramisu/base.py b/tests/dictionaries/20family_dynamic_description/tiramisu/base.py index 71f6d1e16..0d7a99750 100644 --- a/tests/dictionaries/20family_dynamic_description/tiramisu/base.py +++ b/tests/dictionaries/20family_dynamic_description/tiramisu/base.py @@ -19,7 +19,54 @@ def _load_functions(path): continue func[function] = getattr(func_, function) _load_functions('tests/dictionaries/../eosfunc/test.py') +from jinja2 import StrictUndefined, DictLoader +from jinja2.sandbox import SandboxedEnvironment +from rougail.annotator.variable import CONVERT_OPTION +from tiramisu.error import ValueWarning +def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): + global ENV, CONVERT_OPTION + kw = {} + for key, value in kwargs.items(): + if '.' in key: + c_kw = kw + path, var = key.rsplit('.', 1) + for subkey in path.split('.'): + c_kw = c_kw.setdefault(subkey, {}) + c_kw[var] = value + else: + kw[key] = value + values = ENV.get_template(__internal_jinja).render(kw, **func).strip() + convert = CONVERT_OPTION[__internal_type].get('func', str) + if __internal_multi: + return [convert(val) for val in values.split()] + values = convert(values) + return values if values != '' and values != 'None' else None +def variable_to_property(prop, value): + return prop if value else None +def jinja_to_property(prop, **kwargs): + value = func['jinja_to_function'](**kwargs) + return func['variable_to_property'](prop, value is not None) +def jinja_to_property_help(prop, **kwargs): + value = func['jinja_to_function'](**kwargs) + return (prop, f'"{prop}" ({value})') +def valid_with_jinja(warnings_only=False, **kwargs): + global ValueWarning + value = func['jinja_to_function'](**kwargs) + if value: + if warnings_only: + raise ValueWarning(value) + else: + raise ValueError(value) +func['jinja_to_function'] = jinja_to_function +func['jinja_to_property'] = jinja_to_property +func['jinja_to_property_help'] = jinja_to_property_help +func['variable_to_property'] = variable_to_property +func['valid_with_jinja'] = valid_with_jinja +dict_env = {} from rougail.tiramisu import ConvertDynOptionDescription +ENV = SandboxedEnvironment(loader=DictLoader(dict_env), undefined=StrictUndefined) +ENV.filters = func +ENV.compile_templates('jinja_caches', zip=None) option_3 = StrOption(name="varname", doc="No change", multi=True, default=["val1", "val2"], default_multi="val1", properties=frozenset({"mandatory", "notempty", "standard"})) optiondescription_2 = OptionDescription(name="general", doc="general", children=[option_3], properties=frozenset({"standard"})) option_5 = StrOption(name="vardyn", doc="No change", properties=frozenset({"standard"})) diff --git a/tests/dictionaries/20family_dynamic_description/tiramisu/multi.py b/tests/dictionaries/20family_dynamic_description/tiramisu/multi.py index 0c9ab4f35..c3b3eb761 100644 --- a/tests/dictionaries/20family_dynamic_description/tiramisu/multi.py +++ b/tests/dictionaries/20family_dynamic_description/tiramisu/multi.py @@ -19,7 +19,54 @@ def _load_functions(path): continue func[function] = getattr(func_, function) _load_functions('tests/dictionaries/../eosfunc/test.py') +from jinja2 import StrictUndefined, DictLoader +from jinja2.sandbox import SandboxedEnvironment +from rougail.annotator.variable import CONVERT_OPTION +from tiramisu.error import ValueWarning +def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): + global ENV, CONVERT_OPTION + kw = {} + for key, value in kwargs.items(): + if '.' in key: + c_kw = kw + path, var = key.rsplit('.', 1) + for subkey in path.split('.'): + c_kw = c_kw.setdefault(subkey, {}) + c_kw[var] = value + else: + kw[key] = value + values = ENV.get_template(__internal_jinja).render(kw, **func).strip() + convert = CONVERT_OPTION[__internal_type].get('func', str) + if __internal_multi: + return [convert(val) for val in values.split()] + values = convert(values) + return values if values != '' and values != 'None' else None +def variable_to_property(prop, value): + return prop if value else None +def jinja_to_property(prop, **kwargs): + value = func['jinja_to_function'](**kwargs) + return func['variable_to_property'](prop, value is not None) +def jinja_to_property_help(prop, **kwargs): + value = func['jinja_to_function'](**kwargs) + return (prop, f'"{prop}" ({value})') +def valid_with_jinja(warnings_only=False, **kwargs): + global ValueWarning + value = func['jinja_to_function'](**kwargs) + if value: + if warnings_only: + raise ValueWarning(value) + else: + raise ValueError(value) +func['jinja_to_function'] = jinja_to_function +func['jinja_to_property'] = jinja_to_property +func['jinja_to_property_help'] = jinja_to_property_help +func['variable_to_property'] = variable_to_property +func['valid_with_jinja'] = valid_with_jinja +dict_env = {} from rougail.tiramisu import ConvertDynOptionDescription +ENV = SandboxedEnvironment(loader=DictLoader(dict_env), undefined=StrictUndefined) +ENV.filters = func +ENV.compile_templates('jinja_caches', zip=None) option_4 = StrOption(name="varname", doc="No change", multi=True, default=["val1", "val2"], default_multi="val1", properties=frozenset({"mandatory", "notempty", "standard"})) optiondescription_3 = OptionDescription(name="general", doc="general", children=[option_4], properties=frozenset({"standard"})) option_6 = StrOption(name="vardyn", doc="No change", properties=frozenset({"standard"})) diff --git a/tests/dictionaries/20family_dynamic_jinja/__init__.py b/tests/dictionaries/20family_dynamic_jinja/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/tests/dictionaries/20family_dynamic_jinja/dictionaries/rougail/00-base.yml b/tests/dictionaries/20family_dynamic_jinja/dictionaries/rougail/00-base.yml new file mode 100644 index 000000000..f9735e83b --- /dev/null +++ b/tests/dictionaries/20family_dynamic_jinja/dictionaries/rougail/00-base.yml @@ -0,0 +1,23 @@ +--- +version: '1.1' +general: + varname: + type: string + description: No change + multi: true + default: + - val1 + - val2 +dyn: + type: dynamic + dynamic: + type: jinja + jinja: | + {% for val in rougail.general.varname %} + {{ loop.index }} + {% endfor %} + propertyerror: false + vardyn: + type: string + description: No change + default: val diff --git a/tests/dictionaries/20family_dynamic_jinja/makedict/after.json b/tests/dictionaries/20family_dynamic_jinja/makedict/after.json new file mode 100644 index 000000000..c7d96c38a --- /dev/null +++ b/tests/dictionaries/20family_dynamic_jinja/makedict/after.json @@ -0,0 +1,17 @@ +{ + "rougail.general.varname": { + "owner": "default", + "value": [ + "val1", + "val2" + ] + }, + "rougail.dyn1.vardyn": { + "owner": "default", + "value": "val" + }, + "rougail.dyn2.vardyn": { + "owner": "default", + "value": "val" + } +} diff --git a/tests/dictionaries/20family_dynamic_jinja/makedict/base.json b/tests/dictionaries/20family_dynamic_jinja/makedict/base.json new file mode 100644 index 000000000..253012453 --- /dev/null +++ b/tests/dictionaries/20family_dynamic_jinja/makedict/base.json @@ -0,0 +1,8 @@ +{ + "rougail.general.varname": [ + "val1", + "val2" + ], + "rougail.dyn1.vardyn": "val", + "rougail.dyn2.vardyn": "val" +} diff --git a/tests/dictionaries/20family_dynamic_jinja/makedict/before.json b/tests/dictionaries/20family_dynamic_jinja/makedict/before.json new file mode 100644 index 000000000..c7d96c38a --- /dev/null +++ b/tests/dictionaries/20family_dynamic_jinja/makedict/before.json @@ -0,0 +1,17 @@ +{ + "rougail.general.varname": { + "owner": "default", + "value": [ + "val1", + "val2" + ] + }, + "rougail.dyn1.vardyn": { + "owner": "default", + "value": "val" + }, + "rougail.dyn2.vardyn": { + "owner": "default", + "value": "val" + } +} diff --git a/tests/dictionaries/20family_dynamic_jinja/tiramisu/base.py b/tests/dictionaries/20family_dynamic_jinja/tiramisu/base.py new file mode 100644 index 000000000..a5651b54c --- /dev/null +++ b/tests/dictionaries/20family_dynamic_jinja/tiramisu/base.py @@ -0,0 +1,76 @@ +from tiramisu import * +from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("standard") +ALLOWED_LEADER_PROPERTIES.add("advanced") +from importlib.machinery import SourceFileLoader as _SourceFileLoader +from importlib.util import spec_from_loader as _spec_from_loader, module_from_spec as _module_from_spec +global func +func = {'calc_value': calc_value} + +def _load_functions(path): + global _SourceFileLoader, _spec_from_loader, _module_from_spec, func + loader = _SourceFileLoader('func', path) + spec = _spec_from_loader(loader.name, loader) + func_ = _module_from_spec(spec) + loader.exec_module(func_) + for function in dir(func_): + if function.startswith('_'): + continue + func[function] = getattr(func_, function) +_load_functions('tests/dictionaries/../eosfunc/test.py') +from jinja2 import StrictUndefined, DictLoader +from jinja2.sandbox import SandboxedEnvironment +from rougail.annotator.variable import CONVERT_OPTION +from tiramisu.error import ValueWarning +def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): + global ENV, CONVERT_OPTION + kw = {} + for key, value in kwargs.items(): + if '.' in key: + c_kw = kw + path, var = key.rsplit('.', 1) + for subkey in path.split('.'): + c_kw = c_kw.setdefault(subkey, {}) + c_kw[var] = value + else: + kw[key] = value + values = ENV.get_template(__internal_jinja).render(kw, **func).strip() + convert = CONVERT_OPTION[__internal_type].get('func', str) + if __internal_multi: + return [convert(val) for val in values.split()] + values = convert(values) + return values if values != '' and values != 'None' else None +def variable_to_property(prop, value): + return prop if value else None +def jinja_to_property(prop, **kwargs): + value = func['jinja_to_function'](**kwargs) + return func['variable_to_property'](prop, value is not None) +def jinja_to_property_help(prop, **kwargs): + value = func['jinja_to_function'](**kwargs) + return (prop, f'"{prop}" ({value})') +def valid_with_jinja(warnings_only=False, **kwargs): + global ValueWarning + value = func['jinja_to_function'](**kwargs) + if value: + if warnings_only: + raise ValueWarning(value) + else: + raise ValueError(value) +func['jinja_to_function'] = jinja_to_function +func['jinja_to_property'] = jinja_to_property +func['jinja_to_property_help'] = jinja_to_property_help +func['variable_to_property'] = variable_to_property +func['valid_with_jinja'] = valid_with_jinja +dict_env = {} +from rougail.tiramisu import ConvertDynOptionDescription +dict_env['dynamic_rougail.dyn'] = "{% for val in rougail.general.varname %}\n{{ loop.index }}\n{% endfor %}\n" +ENV = SandboxedEnvironment(loader=DictLoader(dict_env), undefined=StrictUndefined) +ENV.filters = func +ENV.compile_templates('jinja_caches', zip=None) +option_3 = StrOption(name="varname", doc="No change", multi=True, default=["val1", "val2"], default_multi="val1", properties=frozenset({"mandatory", "notempty", "standard"})) +optiondescription_2 = OptionDescription(name="general", doc="general", children=[option_3], properties=frozenset({"standard"})) +option_5 = StrOption(name="vardyn", doc="No change", default="val", properties=frozenset({"mandatory", "standard"})) +optiondescription_4 = ConvertDynOptionDescription(name="dyn", doc="dyn", suffixes=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("dynamic_rougail.dyn"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(True), 'rougail.general.varname': ParamOption(option_3)})), children=[option_5], properties=frozenset({"standard"})) +optiondescription_1 = OptionDescription(name="rougail", doc="rougail", children=[optiondescription_2, optiondescription_4], properties=frozenset({"standard"})) +option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1]) diff --git a/tests/dictionaries/20family_dynamic_jinja/tiramisu/multi.py b/tests/dictionaries/20family_dynamic_jinja/tiramisu/multi.py new file mode 100644 index 000000000..1df72d1ba --- /dev/null +++ b/tests/dictionaries/20family_dynamic_jinja/tiramisu/multi.py @@ -0,0 +1,84 @@ +from tiramisu import * +from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("standard") +ALLOWED_LEADER_PROPERTIES.add("advanced") +from importlib.machinery import SourceFileLoader as _SourceFileLoader +from importlib.util import spec_from_loader as _spec_from_loader, module_from_spec as _module_from_spec +global func +func = {'calc_value': calc_value} + +def _load_functions(path): + global _SourceFileLoader, _spec_from_loader, _module_from_spec, func + loader = _SourceFileLoader('func', path) + spec = _spec_from_loader(loader.name, loader) + func_ = _module_from_spec(spec) + loader.exec_module(func_) + for function in dir(func_): + if function.startswith('_'): + continue + func[function] = getattr(func_, function) +_load_functions('tests/dictionaries/../eosfunc/test.py') +from jinja2 import StrictUndefined, DictLoader +from jinja2.sandbox import SandboxedEnvironment +from rougail.annotator.variable import CONVERT_OPTION +from tiramisu.error import ValueWarning +def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): + global ENV, CONVERT_OPTION + kw = {} + for key, value in kwargs.items(): + if '.' in key: + c_kw = kw + path, var = key.rsplit('.', 1) + for subkey in path.split('.'): + c_kw = c_kw.setdefault(subkey, {}) + c_kw[var] = value + else: + kw[key] = value + values = ENV.get_template(__internal_jinja).render(kw, **func).strip() + convert = CONVERT_OPTION[__internal_type].get('func', str) + if __internal_multi: + return [convert(val) for val in values.split()] + values = convert(values) + return values if values != '' and values != 'None' else None +def variable_to_property(prop, value): + return prop if value else None +def jinja_to_property(prop, **kwargs): + value = func['jinja_to_function'](**kwargs) + return func['variable_to_property'](prop, value is not None) +def jinja_to_property_help(prop, **kwargs): + value = func['jinja_to_function'](**kwargs) + return (prop, f'"{prop}" ({value})') +def valid_with_jinja(warnings_only=False, **kwargs): + global ValueWarning + value = func['jinja_to_function'](**kwargs) + if value: + if warnings_only: + raise ValueWarning(value) + else: + raise ValueError(value) +func['jinja_to_function'] = jinja_to_function +func['jinja_to_property'] = jinja_to_property +func['jinja_to_property_help'] = jinja_to_property_help +func['variable_to_property'] = variable_to_property +func['valid_with_jinja'] = valid_with_jinja +dict_env = {} +from rougail.tiramisu import ConvertDynOptionDescription +dict_env['dynamic_1.rougail.dyn'] = "{% for val in rougail.general.varname %}\n{{ loop.index }}\n{% endfor %}\n" +dict_env['dynamic_2.rougail.dyn'] = "{% for val in rougail.general.varname %}\n{{ loop.index }}\n{% endfor %}\n" +ENV = SandboxedEnvironment(loader=DictLoader(dict_env), undefined=StrictUndefined) +ENV.filters = func +ENV.compile_templates('jinja_caches', zip=None) +option_4 = StrOption(name="varname", doc="No change", multi=True, default=["val1", "val2"], default_multi="val1", properties=frozenset({"mandatory", "notempty", "standard"})) +optiondescription_3 = OptionDescription(name="general", doc="general", children=[option_4], properties=frozenset({"standard"})) +option_6 = StrOption(name="vardyn", doc="No change", default="val", properties=frozenset({"mandatory", "standard"})) +optiondescription_5 = ConvertDynOptionDescription(name="dyn", doc="dyn", suffixes=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("dynamic_1.rougail.dyn"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(True), 'rougail.general.varname': ParamOption(option_4)})), children=[option_6], properties=frozenset({"standard"})) +optiondescription_2 = OptionDescription(name="rougail", doc="rougail", children=[optiondescription_3, optiondescription_5], properties=frozenset({"standard"})) +optiondescription_1 = OptionDescription(name="1", doc="1", children=[optiondescription_2], properties=frozenset({"standard"})) +option_10 = StrOption(name="varname", doc="No change", multi=True, default=["val1", "val2"], default_multi="val1", properties=frozenset({"mandatory", "notempty", "standard"})) +optiondescription_9 = OptionDescription(name="general", doc="general", children=[option_10], properties=frozenset({"standard"})) +option_12 = StrOption(name="vardyn", doc="No change", default="val", properties=frozenset({"mandatory", "standard"})) +optiondescription_11 = ConvertDynOptionDescription(name="dyn", doc="dyn", suffixes=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("dynamic_2.rougail.dyn"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(True), 'rougail.general.varname': ParamOption(option_10)})), children=[option_12], properties=frozenset({"standard"})) +optiondescription_8 = OptionDescription(name="rougail", doc="rougail", children=[optiondescription_9, optiondescription_11], properties=frozenset({"standard"})) +optiondescription_7 = OptionDescription(name="2", doc="2", children=[optiondescription_8], properties=frozenset({"standard"})) +option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1, optiondescription_7]) diff --git a/tests/dictionaries/20family_dynamic_jinja_fill/dictionaries/rougail/00-base.yml b/tests/dictionaries/20family_dynamic_jinja_fill/dictionaries/rougail/00-base.yml index db9d13a55..efe3e479f 100644 --- a/tests/dictionaries/20family_dynamic_jinja_fill/dictionaries/rougail/00-base.yml +++ b/tests/dictionaries/20family_dynamic_jinja_fill/dictionaries/rougail/00-base.yml @@ -1,5 +1,5 @@ --- -version: '1.0' +version: '1.1' general: varname: type: string @@ -9,7 +9,10 @@ general: - val2 dyn: type: dynamic - variable: rougail.general.varname + dynamic: + type: variable + variable: rougail.general.varname + propertyerror: false vardyn: type: string default: val diff --git a/tests/dictionaries/20family_dynamic_leadership/dictionaries/rougail/00-base.yml b/tests/dictionaries/20family_dynamic_leadership/dictionaries/rougail/00-base.yml index b78bc38fb..ab2281959 100644 --- a/tests/dictionaries/20family_dynamic_leadership/dictionaries/rougail/00-base.yml +++ b/tests/dictionaries/20family_dynamic_leadership/dictionaries/rougail/00-base.yml @@ -1,4 +1,4 @@ -version: '1.0' +version: '1.1' general: varname: type: string @@ -9,7 +9,10 @@ general: - val2 dyn: type: dynamic - variable: rougail.general.varname + dynamic: + type: variable + variable: rougail.general.varname + propertyerror: false vardyn: type: string description: No change diff --git a/tests/dictionaries/20family_dynamic_leadership/tiramisu/base.py b/tests/dictionaries/20family_dynamic_leadership/tiramisu/base.py index 6a99e7183..202befc0b 100644 --- a/tests/dictionaries/20family_dynamic_leadership/tiramisu/base.py +++ b/tests/dictionaries/20family_dynamic_leadership/tiramisu/base.py @@ -19,7 +19,54 @@ def _load_functions(path): continue func[function] = getattr(func_, function) _load_functions('tests/dictionaries/../eosfunc/test.py') +from jinja2 import StrictUndefined, DictLoader +from jinja2.sandbox import SandboxedEnvironment +from rougail.annotator.variable import CONVERT_OPTION +from tiramisu.error import ValueWarning +def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): + global ENV, CONVERT_OPTION + kw = {} + for key, value in kwargs.items(): + if '.' in key: + c_kw = kw + path, var = key.rsplit('.', 1) + for subkey in path.split('.'): + c_kw = c_kw.setdefault(subkey, {}) + c_kw[var] = value + else: + kw[key] = value + values = ENV.get_template(__internal_jinja).render(kw, **func).strip() + convert = CONVERT_OPTION[__internal_type].get('func', str) + if __internal_multi: + return [convert(val) for val in values.split()] + values = convert(values) + return values if values != '' and values != 'None' else None +def variable_to_property(prop, value): + return prop if value else None +def jinja_to_property(prop, **kwargs): + value = func['jinja_to_function'](**kwargs) + return func['variable_to_property'](prop, value is not None) +def jinja_to_property_help(prop, **kwargs): + value = func['jinja_to_function'](**kwargs) + return (prop, f'"{prop}" ({value})') +def valid_with_jinja(warnings_only=False, **kwargs): + global ValueWarning + value = func['jinja_to_function'](**kwargs) + if value: + if warnings_only: + raise ValueWarning(value) + else: + raise ValueError(value) +func['jinja_to_function'] = jinja_to_function +func['jinja_to_property'] = jinja_to_property +func['jinja_to_property_help'] = jinja_to_property_help +func['variable_to_property'] = variable_to_property +func['valid_with_jinja'] = valid_with_jinja +dict_env = {} from rougail.tiramisu import ConvertDynOptionDescription +ENV = SandboxedEnvironment(loader=DictLoader(dict_env), undefined=StrictUndefined) +ENV.filters = func +ENV.compile_templates('jinja_caches', zip=None) option_3 = StrOption(name="varname", doc="No change", multi=True, default=["val1", "val2"], default_multi="val1", properties=frozenset({"mandatory", "notempty", "standard"})) optiondescription_2 = OptionDescription(name="general", doc="general", children=[option_3], properties=frozenset({"standard"})) option_5 = StrOption(name="vardyn", doc="No change", properties=frozenset({"standard"})) diff --git a/tests/dictionaries/20family_dynamic_leadership/tiramisu/multi.py b/tests/dictionaries/20family_dynamic_leadership/tiramisu/multi.py index de6b73a2a..ddc6d6468 100644 --- a/tests/dictionaries/20family_dynamic_leadership/tiramisu/multi.py +++ b/tests/dictionaries/20family_dynamic_leadership/tiramisu/multi.py @@ -19,7 +19,54 @@ def _load_functions(path): continue func[function] = getattr(func_, function) _load_functions('tests/dictionaries/../eosfunc/test.py') +from jinja2 import StrictUndefined, DictLoader +from jinja2.sandbox import SandboxedEnvironment +from rougail.annotator.variable import CONVERT_OPTION +from tiramisu.error import ValueWarning +def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): + global ENV, CONVERT_OPTION + kw = {} + for key, value in kwargs.items(): + if '.' in key: + c_kw = kw + path, var = key.rsplit('.', 1) + for subkey in path.split('.'): + c_kw = c_kw.setdefault(subkey, {}) + c_kw[var] = value + else: + kw[key] = value + values = ENV.get_template(__internal_jinja).render(kw, **func).strip() + convert = CONVERT_OPTION[__internal_type].get('func', str) + if __internal_multi: + return [convert(val) for val in values.split()] + values = convert(values) + return values if values != '' and values != 'None' else None +def variable_to_property(prop, value): + return prop if value else None +def jinja_to_property(prop, **kwargs): + value = func['jinja_to_function'](**kwargs) + return func['variable_to_property'](prop, value is not None) +def jinja_to_property_help(prop, **kwargs): + value = func['jinja_to_function'](**kwargs) + return (prop, f'"{prop}" ({value})') +def valid_with_jinja(warnings_only=False, **kwargs): + global ValueWarning + value = func['jinja_to_function'](**kwargs) + if value: + if warnings_only: + raise ValueWarning(value) + else: + raise ValueError(value) +func['jinja_to_function'] = jinja_to_function +func['jinja_to_property'] = jinja_to_property +func['jinja_to_property_help'] = jinja_to_property_help +func['variable_to_property'] = variable_to_property +func['valid_with_jinja'] = valid_with_jinja +dict_env = {} from rougail.tiramisu import ConvertDynOptionDescription +ENV = SandboxedEnvironment(loader=DictLoader(dict_env), undefined=StrictUndefined) +ENV.filters = func +ENV.compile_templates('jinja_caches', zip=None) option_4 = StrOption(name="varname", doc="No change", multi=True, default=["val1", "val2"], default_multi="val1", properties=frozenset({"mandatory", "notempty", "standard"})) optiondescription_3 = OptionDescription(name="general", doc="general", children=[option_4], properties=frozenset({"standard"})) option_6 = StrOption(name="vardyn", doc="No change", properties=frozenset({"standard"})) diff --git a/tests/dictionaries/20family_dynamic_number/dictionaries/rougail/00-base.yml b/tests/dictionaries/20family_dynamic_number/dictionaries/rougail/00-base.yml index 8be8b9a29..8f17b72b7 100644 --- a/tests/dictionaries/20family_dynamic_number/dictionaries/rougail/00-base.yml +++ b/tests/dictionaries/20family_dynamic_number/dictionaries/rougail/00-base.yml @@ -1,5 +1,5 @@ --- -version: '1.0' +version: '1.1' general: varname: type: number @@ -10,7 +10,10 @@ general: - 2 dyn: type: dynamic - variable: rougail.general.varname + dynamic: + type: variable + variable: rougail.general.varname + propertyerror: false vardyn: type: string description: No change diff --git a/tests/dictionaries/20family_dynamic_variable_outside/dictionaries/rougail/00-base.yml b/tests/dictionaries/20family_dynamic_variable_outside/dictionaries/rougail/00-base.yml index 984338834..67d6e1134 100644 --- a/tests/dictionaries/20family_dynamic_variable_outside/dictionaries/rougail/00-base.yml +++ b/tests/dictionaries/20family_dynamic_variable_outside/dictionaries/rougail/00-base.yml @@ -1,4 +1,5 @@ -version: '1.0' +--- +version: '1.1' varname: multi: true default: @@ -6,7 +7,10 @@ varname: - val2 my_dyn_family_: type: dynamic - variable: rougail.varname + dynamic: + type: variable + variable: rougail.varname + propertyerror: false description: 'Describe ' my_dyn_var_: type: string diff --git a/tests/dictionaries/20family_dynamic_variable_outside_suffix/dictionaries/rougail/00-base.yml b/tests/dictionaries/20family_dynamic_variable_outside_suffix/dictionaries/rougail/00-base.yml index 1b3508bc3..b66485ed4 100644 --- a/tests/dictionaries/20family_dynamic_variable_outside_suffix/dictionaries/rougail/00-base.yml +++ b/tests/dictionaries/20family_dynamic_variable_outside_suffix/dictionaries/rougail/00-base.yml @@ -1,5 +1,5 @@ --- -version: '1.0' +version: '1.1' varname: multi: true default: @@ -7,7 +7,10 @@ varname: - val2 my_dyn_family_: type: dynamic - variable: rougail.varname + dynamic: + type: variable + variable: rougail.varname + propertyerror: false description: 'Describe ' my_dyn_var: type: string diff --git a/tests/dictionaries/61extra_dyn/dictionaries/extra/00-base.yml b/tests/dictionaries/61extra_dyn/dictionaries/extra/00-base.yml index d3620ab91..5e447ce5d 100644 --- a/tests/dictionaries/61extra_dyn/dictionaries/extra/00-base.yml +++ b/tests/dictionaries/61extra_dyn/dictionaries/extra/00-base.yml @@ -1,7 +1,11 @@ -version: '1.0' +--- +version: '1.1' ejabberd: type: dynamic - variable: rougail.general.varname + dynamic: + type: variable + variable: rougail.general.varname + propertyerror: false mode: type: string mandatory: false diff --git a/tests/dictionaries/61extra_dyn/tiramisu/base.py b/tests/dictionaries/61extra_dyn/tiramisu/base.py index 63e704447..49411e9b8 100644 --- a/tests/dictionaries/61extra_dyn/tiramisu/base.py +++ b/tests/dictionaries/61extra_dyn/tiramisu/base.py @@ -19,7 +19,54 @@ def _load_functions(path): continue func[function] = getattr(func_, function) _load_functions('tests/dictionaries/../eosfunc/test.py') +from jinja2 import StrictUndefined, DictLoader +from jinja2.sandbox import SandboxedEnvironment +from rougail.annotator.variable import CONVERT_OPTION +from tiramisu.error import ValueWarning +def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): + global ENV, CONVERT_OPTION + kw = {} + for key, value in kwargs.items(): + if '.' in key: + c_kw = kw + path, var = key.rsplit('.', 1) + for subkey in path.split('.'): + c_kw = c_kw.setdefault(subkey, {}) + c_kw[var] = value + else: + kw[key] = value + values = ENV.get_template(__internal_jinja).render(kw, **func).strip() + convert = CONVERT_OPTION[__internal_type].get('func', str) + if __internal_multi: + return [convert(val) for val in values.split()] + values = convert(values) + return values if values != '' and values != 'None' else None +def variable_to_property(prop, value): + return prop if value else None +def jinja_to_property(prop, **kwargs): + value = func['jinja_to_function'](**kwargs) + return func['variable_to_property'](prop, value is not None) +def jinja_to_property_help(prop, **kwargs): + value = func['jinja_to_function'](**kwargs) + return (prop, f'"{prop}" ({value})') +def valid_with_jinja(warnings_only=False, **kwargs): + global ValueWarning + value = func['jinja_to_function'](**kwargs) + if value: + if warnings_only: + raise ValueWarning(value) + else: + raise ValueError(value) +func['jinja_to_function'] = jinja_to_function +func['jinja_to_property'] = jinja_to_property +func['jinja_to_property_help'] = jinja_to_property_help +func['variable_to_property'] = variable_to_property +func['valid_with_jinja'] = valid_with_jinja +dict_env = {} from rougail.tiramisu import ConvertDynOptionDescription +ENV = SandboxedEnvironment(loader=DictLoader(dict_env), undefined=StrictUndefined) +ENV.filters = func +ENV.compile_templates('jinja_caches', zip=None) option_3 = StrOption(name="varname", doc="No change", multi=True, default=["a"], default_multi="a", properties=frozenset({"mandatory", "notempty", "standard"})) optiondescription_2 = OptionDescription(name="general", doc="général", children=[option_3], properties=frozenset({"standard"})) optiondescription_1 = OptionDescription(name="rougail", doc="rougail", children=[optiondescription_2], properties=frozenset({"standard"})) diff --git a/tests/dictionaries/61extra_dyn/tiramisu/multi.py b/tests/dictionaries/61extra_dyn/tiramisu/multi.py index 1e498a968..13724fd28 100644 --- a/tests/dictionaries/61extra_dyn/tiramisu/multi.py +++ b/tests/dictionaries/61extra_dyn/tiramisu/multi.py @@ -19,7 +19,54 @@ def _load_functions(path): continue func[function] = getattr(func_, function) _load_functions('tests/dictionaries/../eosfunc/test.py') +from jinja2 import StrictUndefined, DictLoader +from jinja2.sandbox import SandboxedEnvironment +from rougail.annotator.variable import CONVERT_OPTION +from tiramisu.error import ValueWarning +def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): + global ENV, CONVERT_OPTION + kw = {} + for key, value in kwargs.items(): + if '.' in key: + c_kw = kw + path, var = key.rsplit('.', 1) + for subkey in path.split('.'): + c_kw = c_kw.setdefault(subkey, {}) + c_kw[var] = value + else: + kw[key] = value + values = ENV.get_template(__internal_jinja).render(kw, **func).strip() + convert = CONVERT_OPTION[__internal_type].get('func', str) + if __internal_multi: + return [convert(val) for val in values.split()] + values = convert(values) + return values if values != '' and values != 'None' else None +def variable_to_property(prop, value): + return prop if value else None +def jinja_to_property(prop, **kwargs): + value = func['jinja_to_function'](**kwargs) + return func['variable_to_property'](prop, value is not None) +def jinja_to_property_help(prop, **kwargs): + value = func['jinja_to_function'](**kwargs) + return (prop, f'"{prop}" ({value})') +def valid_with_jinja(warnings_only=False, **kwargs): + global ValueWarning + value = func['jinja_to_function'](**kwargs) + if value: + if warnings_only: + raise ValueWarning(value) + else: + raise ValueError(value) +func['jinja_to_function'] = jinja_to_function +func['jinja_to_property'] = jinja_to_property +func['jinja_to_property_help'] = jinja_to_property_help +func['variable_to_property'] = variable_to_property +func['valid_with_jinja'] = valid_with_jinja +dict_env = {} from rougail.tiramisu import ConvertDynOptionDescription +ENV = SandboxedEnvironment(loader=DictLoader(dict_env), undefined=StrictUndefined) +ENV.filters = func +ENV.compile_templates('jinja_caches', zip=None) option_4 = StrOption(name="varname", doc="No change", multi=True, default=["a"], default_multi="a", properties=frozenset({"mandatory", "notempty", "standard"})) optiondescription_3 = OptionDescription(name="general", doc="général", children=[option_4], properties=frozenset({"standard"})) optiondescription_2 = OptionDescription(name="rougail", doc="rougail", children=[optiondescription_3], properties=frozenset({"standard"})) diff --git a/tests/dictionaries/61extra_dyn_extra/dictionaries/extra/00-base.yml b/tests/dictionaries/61extra_dyn_extra/dictionaries/extra/00-base.yml index beefdafae..85921bf1b 100644 --- a/tests/dictionaries/61extra_dyn_extra/dictionaries/extra/00-base.yml +++ b/tests/dictionaries/61extra_dyn_extra/dictionaries/extra/00-base.yml @@ -1,3 +1,5 @@ +--- +version: '1.1' general: description: général varname: @@ -5,11 +7,13 @@ general: description: No change multi: true default: - - a + - a ejabberd: type: dynamic - variable: extra.general.varname + dynamic: + type: variable + variable: extra.general.varname + propertyerror: false mode: type: string mandatory: false -version: '1.0' diff --git a/tests/dictionaries/61extra_dyn_extra/tiramisu/base.py b/tests/dictionaries/61extra_dyn_extra/tiramisu/base.py index 0134abef6..3bed78f5c 100644 --- a/tests/dictionaries/61extra_dyn_extra/tiramisu/base.py +++ b/tests/dictionaries/61extra_dyn_extra/tiramisu/base.py @@ -19,7 +19,54 @@ def _load_functions(path): continue func[function] = getattr(func_, function) _load_functions('tests/dictionaries/../eosfunc/test.py') +from jinja2 import StrictUndefined, DictLoader +from jinja2.sandbox import SandboxedEnvironment +from rougail.annotator.variable import CONVERT_OPTION +from tiramisu.error import ValueWarning +def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): + global ENV, CONVERT_OPTION + kw = {} + for key, value in kwargs.items(): + if '.' in key: + c_kw = kw + path, var = key.rsplit('.', 1) + for subkey in path.split('.'): + c_kw = c_kw.setdefault(subkey, {}) + c_kw[var] = value + else: + kw[key] = value + values = ENV.get_template(__internal_jinja).render(kw, **func).strip() + convert = CONVERT_OPTION[__internal_type].get('func', str) + if __internal_multi: + return [convert(val) for val in values.split()] + values = convert(values) + return values if values != '' and values != 'None' else None +def variable_to_property(prop, value): + return prop if value else None +def jinja_to_property(prop, **kwargs): + value = func['jinja_to_function'](**kwargs) + return func['variable_to_property'](prop, value is not None) +def jinja_to_property_help(prop, **kwargs): + value = func['jinja_to_function'](**kwargs) + return (prop, f'"{prop}" ({value})') +def valid_with_jinja(warnings_only=False, **kwargs): + global ValueWarning + value = func['jinja_to_function'](**kwargs) + if value: + if warnings_only: + raise ValueWarning(value) + else: + raise ValueError(value) +func['jinja_to_function'] = jinja_to_function +func['jinja_to_property'] = jinja_to_property +func['jinja_to_property_help'] = jinja_to_property_help +func['variable_to_property'] = variable_to_property +func['valid_with_jinja'] = valid_with_jinja +dict_env = {} from rougail.tiramisu import ConvertDynOptionDescription +ENV = SandboxedEnvironment(loader=DictLoader(dict_env), undefined=StrictUndefined) +ENV.filters = func +ENV.compile_templates('jinja_caches', zip=None) option_3 = StrOption(name="varname", doc="No change", multi=True, default=["a"], default_multi="a", properties=frozenset({"mandatory", "notempty", "standard"})) optiondescription_2 = OptionDescription(name="general", doc="général", children=[option_3], properties=frozenset({"standard"})) optiondescription_1 = OptionDescription(name="rougail", doc="rougail", children=[optiondescription_2], properties=frozenset({"standard"})) diff --git a/tests/dictionaries/61extra_dyn_extra/tiramisu/multi.py b/tests/dictionaries/61extra_dyn_extra/tiramisu/multi.py index 84be0b85a..8f7fd385c 100644 --- a/tests/dictionaries/61extra_dyn_extra/tiramisu/multi.py +++ b/tests/dictionaries/61extra_dyn_extra/tiramisu/multi.py @@ -19,7 +19,54 @@ def _load_functions(path): continue func[function] = getattr(func_, function) _load_functions('tests/dictionaries/../eosfunc/test.py') +from jinja2 import StrictUndefined, DictLoader +from jinja2.sandbox import SandboxedEnvironment +from rougail.annotator.variable import CONVERT_OPTION +from tiramisu.error import ValueWarning +def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): + global ENV, CONVERT_OPTION + kw = {} + for key, value in kwargs.items(): + if '.' in key: + c_kw = kw + path, var = key.rsplit('.', 1) + for subkey in path.split('.'): + c_kw = c_kw.setdefault(subkey, {}) + c_kw[var] = value + else: + kw[key] = value + values = ENV.get_template(__internal_jinja).render(kw, **func).strip() + convert = CONVERT_OPTION[__internal_type].get('func', str) + if __internal_multi: + return [convert(val) for val in values.split()] + values = convert(values) + return values if values != '' and values != 'None' else None +def variable_to_property(prop, value): + return prop if value else None +def jinja_to_property(prop, **kwargs): + value = func['jinja_to_function'](**kwargs) + return func['variable_to_property'](prop, value is not None) +def jinja_to_property_help(prop, **kwargs): + value = func['jinja_to_function'](**kwargs) + return (prop, f'"{prop}" ({value})') +def valid_with_jinja(warnings_only=False, **kwargs): + global ValueWarning + value = func['jinja_to_function'](**kwargs) + if value: + if warnings_only: + raise ValueWarning(value) + else: + raise ValueError(value) +func['jinja_to_function'] = jinja_to_function +func['jinja_to_property'] = jinja_to_property +func['jinja_to_property_help'] = jinja_to_property_help +func['variable_to_property'] = variable_to_property +func['valid_with_jinja'] = valid_with_jinja +dict_env = {} from rougail.tiramisu import ConvertDynOptionDescription +ENV = SandboxedEnvironment(loader=DictLoader(dict_env), undefined=StrictUndefined) +ENV.filters = func +ENV.compile_templates('jinja_caches', zip=None) option_4 = StrOption(name="varname", doc="No change", multi=True, default=["a"], default_multi="a", properties=frozenset({"mandatory", "notempty", "standard"})) optiondescription_3 = OptionDescription(name="general", doc="général", children=[option_4], properties=frozenset({"standard"})) optiondescription_2 = OptionDescription(name="rougail", doc="rougail", children=[optiondescription_3], properties=frozenset({"standard"})) diff --git a/tests/dictionaries_old/00empty/result/services/00_base.yml b/tests/dictionaries_old/00empty/result/services/00_base.yml index c68a20606..8b6e1feff 100644 --- a/tests/dictionaries_old/00empty/result/services/00_base.yml +++ b/tests/dictionaries_old/00empty/result/services/00_base.yml @@ -1,2 +1,2 @@ tata.service: {} -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/00load_autosave/result/rougail/00-base.yml b/tests/dictionaries_old/00load_autosave/result/rougail/00-base.yml index d0c8eeb01..8e514f4d6 100644 --- a/tests/dictionaries_old/00load_autosave/result/rougail/00-base.yml +++ b/tests/dictionaries_old/00load_autosave/result/rougail/00-base.yml @@ -7,4 +7,4 @@ general: description: No change auto_save: true default: non -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/00load_autosaveexpert/result/rougail/00-base.yml b/tests/dictionaries_old/00load_autosaveexpert/result/rougail/00-base.yml index 9b1fadffa..9bd9f3f40 100644 --- a/tests/dictionaries_old/00load_autosaveexpert/result/rougail/00-base.yml +++ b/tests/dictionaries_old/00load_autosaveexpert/result/rougail/00-base.yml @@ -8,4 +8,4 @@ general: auto_save: true mode: advanced default: non -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/00load_comment/result/rougail/00-base.yml b/tests/dictionaries_old/00load_comment/result/rougail/00-base.yml index 1085cc1cc..efac7c360 100644 --- a/tests/dictionaries_old/00load_comment/result/rougail/00-base.yml +++ b/tests/dictionaries_old/00load_comment/result/rougail/00-base.yml @@ -5,4 +5,4 @@ general: description: No change hidden: true default: non -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/00load_notype/result/rougail/00-base.yml b/tests/dictionaries_old/00load_notype/result/rougail/00-base.yml index 1355fc8a8..3801bbcc4 100644 --- a/tests/dictionaries_old/00load_notype/result/rougail/00-base.yml +++ b/tests/dictionaries_old/00load_notype/result/rougail/00-base.yml @@ -7,4 +7,4 @@ general: default: non without_type: default: non -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/00load_save/result/rougail/00-base.yml b/tests/dictionaries_old/00load_save/result/rougail/00-base.yml index 1085cc1cc..efac7c360 100644 --- a/tests/dictionaries_old/00load_save/result/rougail/00-base.yml +++ b/tests/dictionaries_old/00load_save/result/rougail/00-base.yml @@ -5,4 +5,4 @@ general: description: No change hidden: true default: non -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/01auto_base/result/rougail/00-base.yml b/tests/dictionaries_old/01auto_base/result/rougail/00-base.yml index 011db2f68..ce0ec21c1 100644 --- a/tests/dictionaries_old/01auto_base/result/rougail/00-base.yml +++ b/tests/dictionaries_old/01auto_base/result/rougail/00-base.yml @@ -10,4 +10,4 @@ general: type: string description: No change default: non -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/01auto_jinja_base/result/rougail/00-base.yml b/tests/dictionaries_old/01auto_jinja_base/result/rougail/00-base.yml index e89682f7f..33dd13eed 100644 --- a/tests/dictionaries_old/01auto_jinja_base/result/rougail/00-base.yml +++ b/tests/dictionaries_old/01auto_jinja_base/result/rougail/00-base.yml @@ -10,4 +10,4 @@ general: type: string description: No change default: non -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/01auto_jinja_full_path/result/rougail/00-base.yml b/tests/dictionaries_old/01auto_jinja_full_path/result/rougail/00-base.yml index e89682f7f..33dd13eed 100644 --- a/tests/dictionaries_old/01auto_jinja_full_path/result/rougail/00-base.yml +++ b/tests/dictionaries_old/01auto_jinja_full_path/result/rougail/00-base.yml @@ -10,4 +10,4 @@ general: type: string description: No change default: non -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/01auto_jinja_if/result/rougail/00-base.yml b/tests/dictionaries_old/01auto_jinja_if/result/rougail/00-base.yml index b15ebd1d6..96c610a44 100644 --- a/tests/dictionaries_old/01auto_jinja_if/result/rougail/00-base.yml +++ b/tests/dictionaries_old/01auto_jinja_if/result/rougail/00-base.yml @@ -19,4 +19,4 @@ general: default: type: jinja jinja: '{% if mode_conteneur_actif1 == "non" %}oui{% else %}non{% endif %}' -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/01auto_jinja_if_bool/result/rougail/00-base.yml b/tests/dictionaries_old/01auto_jinja_if_bool/result/rougail/00-base.yml index 37f123850..6ec8fa416 100644 --- a/tests/dictionaries_old/01auto_jinja_if_bool/result/rougail/00-base.yml +++ b/tests/dictionaries_old/01auto_jinja_if_bool/result/rougail/00-base.yml @@ -13,4 +13,4 @@ general: default: type: jinja jinja: '{% if not rougail.general.bool %}True,False{% else %}False{% endif %}' -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/01auto_jinja_if_int/result/rougail/00-base.yml b/tests/dictionaries_old/01auto_jinja_if_int/result/rougail/00-base.yml index 36c61eed5..faee0e69a 100644 --- a/tests/dictionaries_old/01auto_jinja_if_int/result/rougail/00-base.yml +++ b/tests/dictionaries_old/01auto_jinja_if_int/result/rougail/00-base.yml @@ -12,4 +12,4 @@ int2: default: type: jinja jinja: '{% if not bool %}3{% else %}4{% endif %}' -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/01auto_jinja_set/result/rougail/00-base.yml b/tests/dictionaries_old/01auto_jinja_set/result/rougail/00-base.yml index f04c5a831..0dd7ac0e1 100644 --- a/tests/dictionaries_old/01auto_jinja_set/result/rougail/00-base.yml +++ b/tests/dictionaries_old/01auto_jinja_set/result/rougail/00-base.yml @@ -12,4 +12,4 @@ int2: default: type: jinja jinja: '{%set bool1 = bool %}{% if not bool1 %}3{% else %}4{% endif %}' -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/01auto_withoutparam/result/rougail/00-base.yml b/tests/dictionaries_old/01auto_withoutparam/result/rougail/00-base.yml index 6a7b569db..e8d87157d 100644 --- a/tests/dictionaries_old/01auto_withoutparam/result/rougail/00-base.yml +++ b/tests/dictionaries_old/01auto_withoutparam/result/rougail/00-base.yml @@ -10,4 +10,4 @@ general: type: string description: No change default: non -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/01base_certificate_owner/result/rougail/00-base.yml b/tests/dictionaries_old/01base_certificate_owner/result/rougail/00-base.yml index 4b7a0ceb7..6ff22701c 100644 --- a/tests/dictionaries_old/01base_certificate_owner/result/rougail/00-base.yml +++ b/tests/dictionaries_old/01base_certificate_owner/result/rougail/00-base.yml @@ -1,4 +1,4 @@ server_name: type: domainname default: example.net -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/01base_certificate_owner/result/services/00-base.yml b/tests/dictionaries_old/01base_certificate_owner/result/services/00-base.yml index 185cefe2d..2c7528636 100644 --- a/tests/dictionaries_old/01base_certificate_owner/result/services/00-base.yml +++ b/tests/dictionaries_old/01base_certificate_owner/result/services/00-base.yml @@ -3,4 +3,4 @@ test.service: certificate: authority: authority owner: example -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/01base_certificate_owner_variable/result/rougail/00-base.yml b/tests/dictionaries_old/01base_certificate_owner_variable/result/rougail/00-base.yml index 68e2ff806..82e1f6dd3 100644 --- a/tests/dictionaries_old/01base_certificate_owner_variable/result/rougail/00-base.yml +++ b/tests/dictionaries_old/01base_certificate_owner_variable/result/rougail/00-base.yml @@ -4,4 +4,4 @@ owner: server_name: type: domainname default: example.net -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/01base_certificate_owner_variable/result/services/00-base.yml b/tests/dictionaries_old/01base_certificate_owner_variable/result/services/00-base.yml index 0b0e158d1..5282f1580 100644 --- a/tests/dictionaries_old/01base_certificate_owner_variable/result/services/00-base.yml +++ b/tests/dictionaries_old/01base_certificate_owner_variable/result/services/00-base.yml @@ -5,4 +5,4 @@ test.service: owner: name: rougail.owner type: variable -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/01base_domainname/result/rougail/00-base.yml b/tests/dictionaries_old/01base_domainname/result/rougail/00-base.yml index 2dd36b636..54de7561b 100644 --- a/tests/dictionaries_old/01base_domainname/result/rougail/00-base.yml +++ b/tests/dictionaries_old/01base_domainname/result/rougail/00-base.yml @@ -3,4 +3,4 @@ general: type: domainname description: Description default: my.domain.name -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/01base_file/result/rougail/00-base.yml b/tests/dictionaries_old/01base_file/result/rougail/00-base.yml index 6f06c87e2..d5ac95002 100644 --- a/tests/dictionaries_old/01base_file/result/rougail/00-base.yml +++ b/tests/dictionaries_old/01base_file/result/rougail/00-base.yml @@ -3,4 +3,4 @@ general: type: string description: Description default: non -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/01base_file/result/services/00-base.yml b/tests/dictionaries_old/01base_file/result/services/00-base.yml index 2618c05c4..11a9020fb 100644 --- a/tests/dictionaries_old/01base_file/result/services/00-base.yml +++ b/tests/dictionaries_old/01base_file/result/services/00-base.yml @@ -3,4 +3,4 @@ test.service: /etc/file: {} /etc/file2: engine: jinja -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/01base_file_disabled/result/rougail/00-base.yml b/tests/dictionaries_old/01base_file_disabled/result/rougail/00-base.yml index 6f06c87e2..d5ac95002 100644 --- a/tests/dictionaries_old/01base_file_disabled/result/rougail/00-base.yml +++ b/tests/dictionaries_old/01base_file_disabled/result/rougail/00-base.yml @@ -3,4 +3,4 @@ general: type: string description: Description default: non -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/01base_file_disabled/result/services/00-base.yml b/tests/dictionaries_old/01base_file_disabled/result/services/00-base.yml index 1a0c56e41..b670ca39e 100644 --- a/tests/dictionaries_old/01base_file_disabled/result/services/00-base.yml +++ b/tests/dictionaries_old/01base_file_disabled/result/services/00-base.yml @@ -5,4 +5,4 @@ test.service: engine: jinja /etc/file3: disabled: true -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/01base_file_include/result/rougail/00-base.yml b/tests/dictionaries_old/01base_file_include/result/rougail/00-base.yml index 6f06c87e2..d5ac95002 100644 --- a/tests/dictionaries_old/01base_file_include/result/rougail/00-base.yml +++ b/tests/dictionaries_old/01base_file_include/result/rougail/00-base.yml @@ -3,4 +3,4 @@ general: type: string description: Description default: non -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/01base_file_include/result/services/00-base.yml b/tests/dictionaries_old/01base_file_include/result/services/00-base.yml index 2618c05c4..11a9020fb 100644 --- a/tests/dictionaries_old/01base_file_include/result/services/00-base.yml +++ b/tests/dictionaries_old/01base_file_include/result/services/00-base.yml @@ -3,4 +3,4 @@ test.service: /etc/file: {} /etc/file2: engine: jinja -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/01base_file_include_content/result/rougail/00-base.yml b/tests/dictionaries_old/01base_file_include_content/result/rougail/00-base.yml index 6f06c87e2..d5ac95002 100644 --- a/tests/dictionaries_old/01base_file_include_content/result/rougail/00-base.yml +++ b/tests/dictionaries_old/01base_file_include_content/result/rougail/00-base.yml @@ -3,4 +3,4 @@ general: type: string description: Description default: non -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/01base_file_include_content/result/services/00-base.yml b/tests/dictionaries_old/01base_file_include_content/result/services/00-base.yml index 363958155..48fea0aa7 100644 --- a/tests/dictionaries_old/01base_file_include_content/result/services/00-base.yml +++ b/tests/dictionaries_old/01base_file_include_content/result/services/00-base.yml @@ -5,4 +5,4 @@ test.service: engine: jinja /etc/dir/incfile: included: content -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/01base_file_include_name/result/rougail/00-base.yml b/tests/dictionaries_old/01base_file_include_name/result/rougail/00-base.yml index 6f06c87e2..d5ac95002 100644 --- a/tests/dictionaries_old/01base_file_include_name/result/rougail/00-base.yml +++ b/tests/dictionaries_old/01base_file_include_name/result/rougail/00-base.yml @@ -3,4 +3,4 @@ general: type: string description: Description default: non -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/01base_file_include_name/result/services/00-base.yml b/tests/dictionaries_old/01base_file_include_name/result/services/00-base.yml index 50189df9c..afcac0006 100644 --- a/tests/dictionaries_old/01base_file_include_name/result/services/00-base.yml +++ b/tests/dictionaries_old/01base_file_include_name/result/services/00-base.yml @@ -5,4 +5,4 @@ test.service: engine: jinja /etc/dir/incfile: included: name -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/01base_file_mode/result/services/00-base.yml b/tests/dictionaries_old/01base_file_mode/result/services/00-base.yml index c4f595db4..f94b56a4b 100644 --- a/tests/dictionaries_old/01base_file_mode/result/services/00-base.yml +++ b/tests/dictionaries_old/01base_file_mode/result/services/00-base.yml @@ -2,4 +2,4 @@ test.service: files: /etc/file: mode: 755 -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/01base_file_mode2/result/services/00-base.yml b/tests/dictionaries_old/01base_file_mode2/result/services/00-base.yml index 813215ef7..47a63eafc 100644 --- a/tests/dictionaries_old/01base_file_mode2/result/services/00-base.yml +++ b/tests/dictionaries_old/01base_file_mode2/result/services/00-base.yml @@ -2,4 +2,4 @@ test.service: files: /etc/file: mode: 1755 -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/01base_file_owner/result/rougail/00-base.yml b/tests/dictionaries_old/01base_file_owner/result/rougail/00-base.yml index 6f06c87e2..d5ac95002 100644 --- a/tests/dictionaries_old/01base_file_owner/result/rougail/00-base.yml +++ b/tests/dictionaries_old/01base_file_owner/result/rougail/00-base.yml @@ -3,4 +3,4 @@ general: type: string description: Description default: non -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/01base_file_owner/result/services/00-base.yml b/tests/dictionaries_old/01base_file_owner/result/services/00-base.yml index cfe723bef..9bbbe9786 100644 --- a/tests/dictionaries_old/01base_file_owner/result/services/00-base.yml +++ b/tests/dictionaries_old/01base_file_owner/result/services/00-base.yml @@ -7,4 +7,4 @@ test.service: owner: nobody group: nobody engine: jinja -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/01base_file_owner_variable/result/rougail/00-base.yml b/tests/dictionaries_old/01base_file_owner_variable/result/rougail/00-base.yml index 0b6263999..787894eb8 100644 --- a/tests/dictionaries_old/01base_file_owner_variable/result/rougail/00-base.yml +++ b/tests/dictionaries_old/01base_file_owner_variable/result/rougail/00-base.yml @@ -9,4 +9,4 @@ general: group: type: unix_user default: nobody -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/01base_file_owner_variable/result/services/00-base.yml b/tests/dictionaries_old/01base_file_owner_variable/result/services/00-base.yml index 9361c0441..403ba450a 100644 --- a/tests/dictionaries_old/01base_file_owner_variable/result/services/00-base.yml +++ b/tests/dictionaries_old/01base_file_owner_variable/result/services/00-base.yml @@ -15,4 +15,4 @@ test.service: name: rougail.general.group type: variable engine: jinja -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/01base_file_patch/result/rougail/00-base.yml b/tests/dictionaries_old/01base_file_patch/result/rougail/00-base.yml index 6f06c87e2..d5ac95002 100644 --- a/tests/dictionaries_old/01base_file_patch/result/rougail/00-base.yml +++ b/tests/dictionaries_old/01base_file_patch/result/rougail/00-base.yml @@ -3,4 +3,4 @@ general: type: string description: Description default: non -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/01base_file_patch/result/services/00-base.yml b/tests/dictionaries_old/01base_file_patch/result/services/00-base.yml index 2618c05c4..11a9020fb 100644 --- a/tests/dictionaries_old/01base_file_patch/result/services/00-base.yml +++ b/tests/dictionaries_old/01base_file_patch/result/services/00-base.yml @@ -3,4 +3,4 @@ test.service: /etc/file: {} /etc/file2: engine: jinja -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/01base_file_tmpfiles_delete_before_create/result/rougail/00-base.yml b/tests/dictionaries_old/01base_file_tmpfiles_delete_before_create/result/rougail/00-base.yml index 6f06c87e2..d5ac95002 100644 --- a/tests/dictionaries_old/01base_file_tmpfiles_delete_before_create/result/rougail/00-base.yml +++ b/tests/dictionaries_old/01base_file_tmpfiles_delete_before_create/result/rougail/00-base.yml @@ -3,4 +3,4 @@ general: type: string description: Description default: non -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/01base_file_tmpfiles_delete_before_create/result/services/00-base.yml b/tests/dictionaries_old/01base_file_tmpfiles_delete_before_create/result/services/00-base.yml index 2618c05c4..11a9020fb 100644 --- a/tests/dictionaries_old/01base_file_tmpfiles_delete_before_create/result/services/00-base.yml +++ b/tests/dictionaries_old/01base_file_tmpfiles_delete_before_create/result/services/00-base.yml @@ -3,4 +3,4 @@ test.service: /etc/file: {} /etc/file2: engine: jinja -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/01base_file_tmpfiles_factory_dir/result/rougail/00-base.yml b/tests/dictionaries_old/01base_file_tmpfiles_factory_dir/result/rougail/00-base.yml index 6f06c87e2..d5ac95002 100644 --- a/tests/dictionaries_old/01base_file_tmpfiles_factory_dir/result/rougail/00-base.yml +++ b/tests/dictionaries_old/01base_file_tmpfiles_factory_dir/result/rougail/00-base.yml @@ -3,4 +3,4 @@ general: type: string description: Description default: non -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/01base_file_tmpfiles_factory_dir/result/services/00-base.yml b/tests/dictionaries_old/01base_file_tmpfiles_factory_dir/result/services/00-base.yml index 2618c05c4..11a9020fb 100644 --- a/tests/dictionaries_old/01base_file_tmpfiles_factory_dir/result/services/00-base.yml +++ b/tests/dictionaries_old/01base_file_tmpfiles_factory_dir/result/services/00-base.yml @@ -3,4 +3,4 @@ test.service: /etc/file: {} /etc/file2: engine: jinja -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/01base_file_utfchar/result/rougail/00-base.yml b/tests/dictionaries_old/01base_file_utfchar/result/rougail/00-base.yml index 6f06c87e2..d5ac95002 100644 --- a/tests/dictionaries_old/01base_file_utfchar/result/rougail/00-base.yml +++ b/tests/dictionaries_old/01base_file_utfchar/result/rougail/00-base.yml @@ -3,4 +3,4 @@ general: type: string description: Description default: non -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/01base_file_utfchar/result/services/00-base.yml b/tests/dictionaries_old/01base_file_utfchar/result/services/00-base.yml index 3b7573b55..4a17cda5f 100644 --- a/tests/dictionaries_old/01base_file_utfchar/result/services/00-base.yml +++ b/tests/dictionaries_old/01base_file_utfchar/result/services/00-base.yml @@ -3,4 +3,4 @@ test.service: /etc/systemd-makefs@dev-disk-by\x2dpartlabel: {} /etc/systemd-makefs@dev-disk-by\x2dpartlabel2: engine: jinja -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/01base_file_var_source/result/rougail/00-base.yml b/tests/dictionaries_old/01base_file_var_source/result/rougail/00-base.yml index 9d8f6ecf8..f6b3f240c 100644 --- a/tests/dictionaries_old/01base_file_var_source/result/rougail/00-base.yml +++ b/tests/dictionaries_old/01base_file_var_source/result/rougail/00-base.yml @@ -7,4 +7,4 @@ general: type: string description: Description default: non -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/01base_file_var_source/result/services/00-base.yml b/tests/dictionaries_old/01base_file_var_source/result/services/00-base.yml index 3edbf08d8..224006286 100644 --- a/tests/dictionaries_old/01base_file_var_source/result/services/00-base.yml +++ b/tests/dictionaries_old/01base_file_var_source/result/services/00-base.yml @@ -4,4 +4,4 @@ test.service: source: name: rougail.general.source_var type: variable -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/01base_float/result/rougail/00-base.yml b/tests/dictionaries_old/01base_float/result/rougail/00-base.yml index aa39818c0..ed6796c1b 100644 --- a/tests/dictionaries_old/01base_float/result/rougail/00-base.yml +++ b/tests/dictionaries_old/01base_float/result/rougail/00-base.yml @@ -9,4 +9,4 @@ general: multi: true default: - 0.527 -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/01base_help_quote/result/rougail/00-base.yml b/tests/dictionaries_old/01base_help_quote/result/rougail/00-base.yml index 30efa25c9..e8f52861d 100644 --- a/tests/dictionaries_old/01base_help_quote/result/rougail/00-base.yml +++ b/tests/dictionaries_old/01base_help_quote/result/rougail/00-base.yml @@ -9,4 +9,4 @@ general: description: Redefine description help: message with " mandatory: false -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/01base_multi/result/rougail/00-base.yml b/tests/dictionaries_old/01base_multi/result/rougail/00-base.yml index 13a77c762..6441deee6 100644 --- a/tests/dictionaries_old/01base_multi/result/rougail/00-base.yml +++ b/tests/dictionaries_old/01base_multi/result/rougail/00-base.yml @@ -6,4 +6,4 @@ general: multi: true default: - non -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/01base_multi_notuniq/result/rougail/00-base.yml b/tests/dictionaries_old/01base_multi_notuniq/result/rougail/00-base.yml index c86588600..0cba74cef 100644 --- a/tests/dictionaries_old/01base_multi_notuniq/result/rougail/00-base.yml +++ b/tests/dictionaries_old/01base_multi_notuniq/result/rougail/00-base.yml @@ -7,4 +7,4 @@ general: unique: false default: - non -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/01base_multi_uniq/result/rougail/00-base.yml b/tests/dictionaries_old/01base_multi_uniq/result/rougail/00-base.yml index a40a48624..19d96507f 100644 --- a/tests/dictionaries_old/01base_multi_uniq/result/rougail/00-base.yml +++ b/tests/dictionaries_old/01base_multi_uniq/result/rougail/00-base.yml @@ -7,4 +7,4 @@ general: unique: true default: - non -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/01base_provider/result/rougail/00-base.yml b/tests/dictionaries_old/01base_provider/result/rougail/00-base.yml index 404c4d132..0ca5b7495 100644 --- a/tests/dictionaries_old/01base_provider/result/rougail/00-base.yml +++ b/tests/dictionaries_old/01base_provider/result/rougail/00-base.yml @@ -10,4 +10,4 @@ general: multi: true default: - 0.527 -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/01base_provider_extra/result/extra/00-base.yml b/tests/dictionaries_old/01base_provider_extra/result/extra/00-base.yml index 18d5fc121..27f54187c 100644 --- a/tests/dictionaries_old/01base_provider_extra/result/extra/00-base.yml +++ b/tests/dictionaries_old/01base_provider_extra/result/extra/00-base.yml @@ -3,4 +3,4 @@ example: type: string provider: example mandatory: false -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/01base_provider_extra/result/rougail/00-base.yml b/tests/dictionaries_old/01base_provider_extra/result/rougail/00-base.yml index d0fcc32bc..dbe765202 100644 --- a/tests/dictionaries_old/01base_provider_extra/result/rougail/00-base.yml +++ b/tests/dictionaries_old/01base_provider_extra/result/rougail/00-base.yml @@ -2,4 +2,4 @@ float: type: float description: Description mandatory: false -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/01base_provider_hidden/result/rougail/00-base.yml b/tests/dictionaries_old/01base_provider_hidden/result/rougail/00-base.yml index 0601452d9..3759f9cec 100644 --- a/tests/dictionaries_old/01base_provider_hidden/result/rougail/00-base.yml +++ b/tests/dictionaries_old/01base_provider_hidden/result/rougail/00-base.yml @@ -11,4 +11,4 @@ general: multi: true default: - 0.527 -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/01base_value_doublequote/result/rougail/00-base.yml b/tests/dictionaries_old/01base_value_doublequote/result/rougail/00-base.yml index ee8d8e599..1ab9a94e8 100644 --- a/tests/dictionaries_old/01base_value_doublequote/result/rougail/00-base.yml +++ b/tests/dictionaries_old/01base_value_doublequote/result/rougail/00-base.yml @@ -4,4 +4,4 @@ general: description: Redefine description hidden: true default: quote" -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/01base_value_doublequote2/result/rougail/00-base.yml b/tests/dictionaries_old/01base_value_doublequote2/result/rougail/00-base.yml index 3071f1a08..1a5f05ccc 100644 --- a/tests/dictionaries_old/01base_value_doublequote2/result/rougail/00-base.yml +++ b/tests/dictionaries_old/01base_value_doublequote2/result/rougail/00-base.yml @@ -4,4 +4,4 @@ general: description: Redefine description hidden: true default: quote'" -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/01base_value_doublequote3/result/rougail/00-base.yml b/tests/dictionaries_old/01base_value_doublequote3/result/rougail/00-base.yml index 7df61e911..b09d796cd 100644 --- a/tests/dictionaries_old/01base_value_doublequote3/result/rougail/00-base.yml +++ b/tests/dictionaries_old/01base_value_doublequote3/result/rougail/00-base.yml @@ -4,4 +4,4 @@ general: description: Redefine description hidden: true default: quote\"\' -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/01base_value_multi_doublequote/result/rougail/00-base.yml b/tests/dictionaries_old/01base_value_multi_doublequote/result/rougail/00-base.yml index ca0dc5158..f6bb1674f 100644 --- a/tests/dictionaries_old/01base_value_multi_doublequote/result/rougail/00-base.yml +++ b/tests/dictionaries_old/01base_value_multi_doublequote/result/rougail/00-base.yml @@ -6,4 +6,4 @@ general: multi: true default: - quote" -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/01base_value_multi_doublequote2/result/rougail/00-base.yml b/tests/dictionaries_old/01base_value_multi_doublequote2/result/rougail/00-base.yml index d09865f89..6346ffee8 100644 --- a/tests/dictionaries_old/01base_value_multi_doublequote2/result/rougail/00-base.yml +++ b/tests/dictionaries_old/01base_value_multi_doublequote2/result/rougail/00-base.yml @@ -6,4 +6,4 @@ general: multi: true default: - quote'" -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/01base_value_multi_quote/result/rougail/00-base.yml b/tests/dictionaries_old/01base_value_multi_quote/result/rougail/00-base.yml index f998e9268..bdc957143 100644 --- a/tests/dictionaries_old/01base_value_multi_quote/result/rougail/00-base.yml +++ b/tests/dictionaries_old/01base_value_multi_quote/result/rougail/00-base.yml @@ -6,4 +6,4 @@ general: multi: true default: - quote' -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/01base_value_quote/result/rougail/00-base.yml b/tests/dictionaries_old/01base_value_quote/result/rougail/00-base.yml index d602e8e26..5ce855d77 100644 --- a/tests/dictionaries_old/01base_value_quote/result/rougail/00-base.yml +++ b/tests/dictionaries_old/01base_value_quote/result/rougail/00-base.yml @@ -4,4 +4,4 @@ general: description: Redefine description hidden: true default: quote' -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/01base_var_name_same_family/result/rougail/00-base.yml b/tests/dictionaries_old/01base_var_name_same_family/result/rougail/00-base.yml index 0a73fd775..00c39cecb 100644 --- a/tests/dictionaries_old/01base_var_name_same_family/result/rougail/00-base.yml +++ b/tests/dictionaries_old/01base_var_name_same_family/result/rougail/00-base.yml @@ -3,4 +3,4 @@ general: type: string description: description default: non -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/01boolean_no_mandatory/result/rougail/00-base.yml b/tests/dictionaries_old/01boolean_no_mandatory/result/rougail/00-base.yml index 456cb907f..32fd522ff 100644 --- a/tests/dictionaries_old/01boolean_no_mandatory/result/rougail/00-base.yml +++ b/tests/dictionaries_old/01boolean_no_mandatory/result/rougail/00-base.yml @@ -1,4 +1,4 @@ my_variable: type: boolean mandatory: false -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/01family_description/result/rougail/00-base.yml b/tests/dictionaries_old/01family_description/result/rougail/00-base.yml index 737ff62b9..14a600058 100644 --- a/tests/dictionaries_old/01family_description/result/rougail/00-base.yml +++ b/tests/dictionaries_old/01family_description/result/rougail/00-base.yml @@ -2,4 +2,4 @@ general: description: Other description mode_conteneur_actif: default: non -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/01fill_autofreeze/result/rougail/00-base.yml b/tests/dictionaries_old/01fill_autofreeze/result/rougail/00-base.yml index 7fafd05a6..610786bfd 100644 --- a/tests/dictionaries_old/01fill_autofreeze/result/rougail/00-base.yml +++ b/tests/dictionaries_old/01fill_autofreeze/result/rougail/00-base.yml @@ -8,4 +8,4 @@ my_var2: server_deployed: type: boolean default: false -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/01fill_autosave/result/rougail/00-base.yml b/tests/dictionaries_old/01fill_autosave/result/rougail/00-base.yml index b16c01b70..7140ac005 100644 --- a/tests/dictionaries_old/01fill_autosave/result/rougail/00-base.yml +++ b/tests/dictionaries_old/01fill_autosave/result/rougail/00-base.yml @@ -12,4 +12,4 @@ general: type: string description: No change default: non -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/01fill_base/result/rougail/00-base.yml b/tests/dictionaries_old/01fill_base/result/rougail/00-base.yml index 1570d0321..de73a6d7d 100644 --- a/tests/dictionaries_old/01fill_base/result/rougail/00-base.yml +++ b/tests/dictionaries_old/01fill_base/result/rougail/00-base.yml @@ -10,4 +10,4 @@ general: type: string description: No change default: non -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/01fill_mandatory/result/rougail/00-base.yml b/tests/dictionaries_old/01fill_mandatory/result/rougail/00-base.yml index c1fe9033e..381c765d6 100644 --- a/tests/dictionaries_old/01fill_mandatory/result/rougail/00-base.yml +++ b/tests/dictionaries_old/01fill_mandatory/result/rougail/00-base.yml @@ -12,4 +12,4 @@ general: type: string description: No change default: non -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/01fill_number/result/rougail/00-base.yml b/tests/dictionaries_old/01fill_number/result/rougail/00-base.yml index b97ed8d77..d6775719c 100644 --- a/tests/dictionaries_old/01fill_number/result/rougail/00-base.yml +++ b/tests/dictionaries_old/01fill_number/result/rougail/00-base.yml @@ -11,4 +11,4 @@ general: type: string description: No change default: non -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/01fill_only_optional/result/rougail/00-base.yml b/tests/dictionaries_old/01fill_only_optional/result/rougail/00-base.yml index 9213a90e1..0809635c2 100644 --- a/tests/dictionaries_old/01fill_only_optional/result/rougail/00-base.yml +++ b/tests/dictionaries_old/01fill_only_optional/result/rougail/00-base.yml @@ -15,4 +15,4 @@ general: type: string description: No change default: non -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/01fill_optional/result/rougail/00-base.yml b/tests/dictionaries_old/01fill_optional/result/rougail/00-base.yml index f9998cc42..7a6ec51fd 100644 --- a/tests/dictionaries_old/01fill_optional/result/rougail/00-base.yml +++ b/tests/dictionaries_old/01fill_optional/result/rougail/00-base.yml @@ -20,4 +20,4 @@ general: type: string description: No change default: non -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/01fill_quote/result/rougail/00-base.yml b/tests/dictionaries_old/01fill_quote/result/rougail/00-base.yml index faa88b6b5..db1f62601 100644 --- a/tests/dictionaries_old/01fill_quote/result/rougail/00-base.yml +++ b/tests/dictionaries_old/01fill_quote/result/rougail/00-base.yml @@ -27,4 +27,4 @@ general: default: type: jinja jinja: '{{ "quote\"\\''" | calc_val }}' -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/01fill_target_optional/result/rougail/00-base.yml b/tests/dictionaries_old/01fill_target_optional/result/rougail/00-base.yml index 8d14352b8..d999f7a32 100644 --- a/tests/dictionaries_old/01fill_target_optional/result/rougail/00-base.yml +++ b/tests/dictionaries_old/01fill_target_optional/result/rougail/00-base.yml @@ -3,4 +3,4 @@ general: type: string description: No change default: non -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/01hidden_if_in_autofreeze/result/rougail/00-base.yml b/tests/dictionaries_old/01hidden_if_in_autofreeze/result/rougail/00-base.yml index 5ceedf641..a918a74d3 100644 --- a/tests/dictionaries_old/01hidden_if_in_autofreeze/result/rougail/00-base.yml +++ b/tests/dictionaries_old/01hidden_if_in_autofreeze/result/rougail/00-base.yml @@ -8,5 +8,5 @@ my_var: jinja: '{{ "yes" | calc_val }}' hidden: type: jinja - jinja: '{% if rougail.server_deployed == true %}true{% else %}false{% endif %}' -version: '1.0' + jinja: '{% if rougail.server_deployed == true %}hidden{% endif %}' +version: '1.1' diff --git a/tests/dictionaries_old/01test/result/rougail/00-base.yml b/tests/dictionaries_old/01test/result/rougail/00-base.yml index ebb1ccc0f..cdefc6042 100644 --- a/tests/dictionaries_old/01test/result/rougail/00-base.yml +++ b/tests/dictionaries_old/01test/result/rougail/00-base.yml @@ -3,4 +3,4 @@ general: test: - test default: non -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/01test_multi/result/rougail/00-base.yml b/tests/dictionaries_old/01test_multi/result/rougail/00-base.yml index feab3f363..881305a4a 100644 --- a/tests/dictionaries_old/01test_multi/result/rougail/00-base.yml +++ b/tests/dictionaries_old/01test_multi/result/rougail/00-base.yml @@ -4,4 +4,4 @@ general: - test1 - test2 default: non -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/01test_multi_none/result/rougail/00-base.yml b/tests/dictionaries_old/01test_multi_none/result/rougail/00-base.yml index 0470e7f47..4d3515a9f 100644 --- a/tests/dictionaries_old/01test_multi_none/result/rougail/00-base.yml +++ b/tests/dictionaries_old/01test_multi_none/result/rougail/00-base.yml @@ -5,4 +5,4 @@ general: - test1 - test2 default: non -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/01test_redefine/result/rougail/00-base.yml b/tests/dictionaries_old/01test_redefine/result/rougail/00-base.yml index ebb1ccc0f..cdefc6042 100644 --- a/tests/dictionaries_old/01test_redefine/result/rougail/00-base.yml +++ b/tests/dictionaries_old/01test_redefine/result/rougail/00-base.yml @@ -3,4 +3,4 @@ general: test: - test default: non -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/01test_redefine/result/rougail/10-base.yml b/tests/dictionaries_old/01test_redefine/result/rougail/10-base.yml index c584566d2..c6cd94a3f 100644 --- a/tests/dictionaries_old/01test_redefine/result/rougail/10-base.yml +++ b/tests/dictionaries_old/01test_redefine/result/rougail/10-base.yml @@ -3,4 +3,4 @@ general: redefine: true test: - test1 -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/01test_redefine_base/result/rougail/00-base.yml b/tests/dictionaries_old/01test_redefine_base/result/rougail/00-base.yml index 5d99ae02e..fffd23ae7 100644 --- a/tests/dictionaries_old/01test_redefine_base/result/rougail/00-base.yml +++ b/tests/dictionaries_old/01test_redefine_base/result/rougail/00-base.yml @@ -1,4 +1,4 @@ my_variable: type: string mandatory: false -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/01test_redefine_base/result/rougail/10-base.yml b/tests/dictionaries_old/01test_redefine_base/result/rougail/10-base.yml index cae538c2c..5c74bb933 100644 --- a/tests/dictionaries_old/01test_redefine_base/result/rougail/10-base.yml +++ b/tests/dictionaries_old/01test_redefine_base/result/rougail/10-base.yml @@ -2,4 +2,4 @@ my_variable: redefine: true test: - test1 -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/01test_redefine_remove/result/rougail/00-base.yml b/tests/dictionaries_old/01test_redefine_remove/result/rougail/00-base.yml index ebb1ccc0f..cdefc6042 100644 --- a/tests/dictionaries_old/01test_redefine_remove/result/rougail/00-base.yml +++ b/tests/dictionaries_old/01test_redefine_remove/result/rougail/00-base.yml @@ -3,4 +3,4 @@ general: test: - test default: non -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/01test_redefine_remove/result/rougail/10-base.yml b/tests/dictionaries_old/01test_redefine_remove/result/rougail/10-base.yml index a05b73a9d..d6c12b06e 100644 --- a/tests/dictionaries_old/01test_redefine_remove/result/rougail/10-base.yml +++ b/tests/dictionaries_old/01test_redefine_remove/result/rougail/10-base.yml @@ -3,4 +3,4 @@ general: redefine: true test: - null -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/02autosave_hidden_frozenifin/result/rougail/00-base.yml b/tests/dictionaries_old/02autosave_hidden_frozenifin/result/rougail/00-base.yml index a0bdf9868..911fe2c8d 100644 --- a/tests/dictionaries_old/02autosave_hidden_frozenifin/result/rougail/00-base.yml +++ b/tests/dictionaries_old/02autosave_hidden_frozenifin/result/rougail/00-base.yml @@ -14,9 +14,9 @@ general: mandatory: false hidden: type: jinja - jinja: '{% if rougail.general.mode_conteneur_actif == "oui" %}true{% else %}false{% - endif %}' + jinja: '{% if rougail.general.mode_conteneur_actif == "oui" %}hidden{% endif + %}' default: type: jinja jinja: '{{ "oui" | calc_val }}' -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/02fill_multi_calc_val/result/rougail/00-base.yml b/tests/dictionaries_old/02fill_multi_calc_val/result/rougail/00-base.yml index ab2cc16bc..7f047d34a 100644 --- a/tests/dictionaries_old/02fill_multi_calc_val/result/rougail/00-base.yml +++ b/tests/dictionaries_old/02fill_multi_calc_val/result/rougail/00-base.yml @@ -6,4 +6,4 @@ var2: default: type: jinja jinja: '{{ rougail.var1 | calc_value(multi=true) }}' -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/02fill_multi_calc_val_multi/result/rougail/00-base.yml b/tests/dictionaries_old/02fill_multi_calc_val_multi/result/rougail/00-base.yml index 56d553c85..9d6d59b73 100644 --- a/tests/dictionaries_old/02fill_multi_calc_val_multi/result/rougail/00-base.yml +++ b/tests/dictionaries_old/02fill_multi_calc_val_multi/result/rougail/00-base.yml @@ -10,4 +10,4 @@ var2: default: type: jinja jinja: '{{ rougail.var1 | calc_value }}' -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/10autosave_hidden/result/rougail/00-base.yml b/tests/dictionaries_old/10autosave_hidden/result/rougail/00-base.yml index 47daf69a8..48fc3cce0 100644 --- a/tests/dictionaries_old/10autosave_hidden/result/rougail/00-base.yml +++ b/tests/dictionaries_old/10autosave_hidden/result/rougail/00-base.yml @@ -16,4 +16,4 @@ general: default: type: jinja jinja: '{{ "oui" | calc_val }}' -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/10base_certificate_list/result/rougail/00-base.yml b/tests/dictionaries_old/10base_certificate_list/result/rougail/00-base.yml index 4b7a0ceb7..6ff22701c 100644 --- a/tests/dictionaries_old/10base_certificate_list/result/rougail/00-base.yml +++ b/tests/dictionaries_old/10base_certificate_list/result/rougail/00-base.yml @@ -1,4 +1,4 @@ server_name: type: domainname default: example.net -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/10base_certificate_list/result/services/00-base.yml b/tests/dictionaries_old/10base_certificate_list/result/services/00-base.yml index 9b0a63501..87f6c1125 100644 --- a/tests/dictionaries_old/10base_certificate_list/result/services/00-base.yml +++ b/tests/dictionaries_old/10base_certificate_list/result/services/00-base.yml @@ -5,6 +5,5 @@ test.service: owner: example disabled: type: jinja - jinja: '{% if rougail.server_name == "example1.net" %}true{% else %}false{% - endif %}' -version: '1.0' + jinja: '{% if rougail.server_name == "example1.net" %}disabled{% endif %}' +version: '1.1' diff --git a/tests/dictionaries_old/10base_certificate_list_disabled/result/rougail/00-base.yml b/tests/dictionaries_old/10base_certificate_list_disabled/result/rougail/00-base.yml index 4b7a0ceb7..6ff22701c 100644 --- a/tests/dictionaries_old/10base_certificate_list_disabled/result/rougail/00-base.yml +++ b/tests/dictionaries_old/10base_certificate_list_disabled/result/rougail/00-base.yml @@ -1,4 +1,4 @@ server_name: type: domainname default: example.net -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/10base_certificate_list_disabled/result/services/00-base.yml b/tests/dictionaries_old/10base_certificate_list_disabled/result/services/00-base.yml index 05e64c002..4260fdc09 100644 --- a/tests/dictionaries_old/10base_certificate_list_disabled/result/services/00-base.yml +++ b/tests/dictionaries_old/10base_certificate_list_disabled/result/services/00-base.yml @@ -5,6 +5,5 @@ test.service: owner: example disabled: type: jinja - jinja: '{% if rougail.server_name == "example.net" %}true{% else %}false{% - endif %}' -version: '1.0' + jinja: '{% if rougail.server_name == "example.net" %}disabled{% endif %}' +version: '1.1' diff --git a/tests/dictionaries_old/10check_base/result/rougail/00-base.yml b/tests/dictionaries_old/10check_base/result/rougail/00-base.yml index 8e223ea13..538513a34 100644 --- a/tests/dictionaries_old/10check_base/result/rougail/00-base.yml +++ b/tests/dictionaries_old/10check_base/result/rougail/00-base.yml @@ -10,4 +10,4 @@ general: validators: - type: jinja jinja: '{{ rougail.general.int | valid_entier(mini=0, maxi=100) }}' -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/10check_base_target_optional/result/rougail/00-base.yml b/tests/dictionaries_old/10check_base_target_optional/result/rougail/00-base.yml index 5d99ae02e..fffd23ae7 100644 --- a/tests/dictionaries_old/10check_base_target_optional/result/rougail/00-base.yml +++ b/tests/dictionaries_old/10check_base_target_optional/result/rougail/00-base.yml @@ -1,4 +1,4 @@ my_variable: type: string mandatory: false -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/10check_no_param/result/rougail/00-base.yml b/tests/dictionaries_old/10check_no_param/result/rougail/00-base.yml index d304294d0..da6f8dec7 100644 --- a/tests/dictionaries_old/10check_no_param/result/rougail/00-base.yml +++ b/tests/dictionaries_old/10check_no_param/result/rougail/00-base.yml @@ -10,4 +10,4 @@ general: validators: - type: jinja jinja: '{{ rougail.general.int | valid_lower }}' -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/10check_option/result/rougail/00-base.yml b/tests/dictionaries_old/10check_option/result/rougail/00-base.yml index 3a960ce5a..fe7aea839 100644 --- a/tests/dictionaries_old/10check_option/result/rougail/00-base.yml +++ b/tests/dictionaries_old/10check_option/result/rougail/00-base.yml @@ -15,4 +15,4 @@ general: - type: jinja jinja: '{{ rougail.general.int | valid_lower(mini=0, maxi=rougail.general.int2) }}' -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/10check_optional/result/rougail/00-base.yml b/tests/dictionaries_old/10check_optional/result/rougail/00-base.yml index ddbf86de6..aef9d1b21 100644 --- a/tests/dictionaries_old/10check_optional/result/rougail/00-base.yml +++ b/tests/dictionaries_old/10check_optional/result/rougail/00-base.yml @@ -26,4 +26,4 @@ general: type: number description: No change mandatory: false -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/10check_valid_differ/result/rougail/00-base.yml b/tests/dictionaries_old/10check_valid_differ/result/rougail/00-base.yml index 1de6670b5..27d138cbc 100644 --- a/tests/dictionaries_old/10check_valid_differ/result/rougail/00-base.yml +++ b/tests/dictionaries_old/10check_valid_differ/result/rougail/00-base.yml @@ -11,4 +11,4 @@ general: type: string description: No change default: non -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/10check_valid_differ_add/result/rougail/00-base.yml b/tests/dictionaries_old/10check_valid_differ_add/result/rougail/00-base.yml index b0a01db0d..3a6962343 100644 --- a/tests/dictionaries_old/10check_valid_differ_add/result/rougail/00-base.yml +++ b/tests/dictionaries_old/10check_valid_differ_add/result/rougail/00-base.yml @@ -19,4 +19,4 @@ general: - type: jinja jinja: '{{ rougail.general.mode_conteneur_actif3 | valid_differ(rougail.general.mode_conteneur_actif1) }}' -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/10check_valid_differ_add/result/rougail/01-base.yml b/tests/dictionaries_old/10check_valid_differ_add/result/rougail/01-base.yml index f94328eae..1c37f7a58 100644 --- a/tests/dictionaries_old/10check_valid_differ_add/result/rougail/01-base.yml +++ b/tests/dictionaries_old/10check_valid_differ_add/result/rougail/01-base.yml @@ -8,4 +8,4 @@ general: - type: jinja jinja: '{{ rougail.general.mode_conteneur_actif3 | valid_differ(__mode_conteneur_actif2) }}' -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/10check_valid_differ_removecheck/result/rougail/00-base.yml b/tests/dictionaries_old/10check_valid_differ_removecheck/result/rougail/00-base.yml index b0a01db0d..3a6962343 100644 --- a/tests/dictionaries_old/10check_valid_differ_removecheck/result/rougail/00-base.yml +++ b/tests/dictionaries_old/10check_valid_differ_removecheck/result/rougail/00-base.yml @@ -19,4 +19,4 @@ general: - type: jinja jinja: '{{ rougail.general.mode_conteneur_actif3 | valid_differ(rougail.general.mode_conteneur_actif1) }}' -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/10check_valid_differ_removecheck/result/rougail/01-base.yml b/tests/dictionaries_old/10check_valid_differ_removecheck/result/rougail/01-base.yml index d543b49dc..3b36095a0 100644 --- a/tests/dictionaries_old/10check_valid_differ_removecheck/result/rougail/01-base.yml +++ b/tests/dictionaries_old/10check_valid_differ_removecheck/result/rougail/01-base.yml @@ -9,4 +9,4 @@ general: - type: jinja jinja: '{{ rougail.general.mode_conteneur_actif3 | valid_differ(__mode_conteneur_actif2) }}' -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/10check_valid_in_network/result/rougail/00-base.yml b/tests/dictionaries_old/10check_valid_in_network/result/rougail/00-base.yml index 361c52058..7282000af 100644 --- a/tests/dictionaries_old/10check_valid_in_network/result/rougail/00-base.yml +++ b/tests/dictionaries_old/10check_valid_in_network/result/rougail/00-base.yml @@ -22,4 +22,4 @@ general: - type: jinja jinja: '{{ rougail.general.adresse_ip | valid_in_network(rougail.general.adresse_ip_eth0, rougail.general.adresse_netmask_eth0) }}' -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/10check_valid_in_network_cidr/result/rougail/00-base.yml b/tests/dictionaries_old/10check_valid_in_network_cidr/result/rougail/00-base.yml index 3b7068f3f..89ff58439 100644 --- a/tests/dictionaries_old/10check_valid_in_network_cidr/result/rougail/00-base.yml +++ b/tests/dictionaries_old/10check_valid_in_network_cidr/result/rougail/00-base.yml @@ -17,4 +17,4 @@ general: - type: jinja jinja: '{{ rougail.general.adresse_ip | valid_in_network(rougail.general.adresse_ip_eth0) }}' -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/10check_valid_ipnetmask/result/rougail/00-base.yml b/tests/dictionaries_old/10check_valid_ipnetmask/result/rougail/00-base.yml index 32a6e15c8..f6d9c6313 100644 --- a/tests/dictionaries_old/10check_valid_ipnetmask/result/rougail/00-base.yml +++ b/tests/dictionaries_old/10check_valid_ipnetmask/result/rougail/00-base.yml @@ -17,4 +17,4 @@ general: - type: jinja jinja: '{{ rougail.general.adresse_netmask_eth0 | valid_ipnetmask(rougail.general.adresse_ip_eth0) }}' -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/10check_valid_jinja/result/rougail/00-base.yml b/tests/dictionaries_old/10check_valid_jinja/result/rougail/00-base.yml index cabe34ba8..5f09f7c38 100644 --- a/tests/dictionaries_old/10check_valid_jinja/result/rougail/00-base.yml +++ b/tests/dictionaries_old/10check_valid_jinja/result/rougail/00-base.yml @@ -11,4 +11,4 @@ general: type: string description: No change default: non -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/10fill_information/result/rougail/00-base.yml b/tests/dictionaries_old/10fill_information/result/rougail/00-base.yml index a53ac94f5..553ce1f43 100644 --- a/tests/dictionaries_old/10fill_information/result/rougail/00-base.yml +++ b/tests/dictionaries_old/10fill_information/result/rougail/00-base.yml @@ -10,4 +10,4 @@ general: __information.test_information: type: information information: test_information -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/10fill_information_multi/result/rougail/00-base.yml b/tests/dictionaries_old/10fill_information_multi/result/rougail/00-base.yml index 874bda513..932599ab7 100644 --- a/tests/dictionaries_old/10fill_information_multi/result/rougail/00-base.yml +++ b/tests/dictionaries_old/10fill_information_multi/result/rougail/00-base.yml @@ -11,4 +11,4 @@ general: __information.test_information: type: information information: test_information -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/10fill_option_information/result/rougail/00-base.yml b/tests/dictionaries_old/10fill_option_information/result/rougail/00-base.yml index 5f8e6e312..fff614949 100644 --- a/tests/dictionaries_old/10fill_option_information/result/rougail/00-base.yml +++ b/tests/dictionaries_old/10fill_option_information/result/rougail/00-base.yml @@ -16,4 +16,4 @@ general: type: information information: test_information variable: rougail.general.variable -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/10fill_option_od_information/result/rougail/00-base.yml b/tests/dictionaries_old/10fill_option_od_information/result/rougail/00-base.yml index 1a088a6ce..2b379b304 100644 --- a/tests/dictionaries_old/10fill_option_od_information/result/rougail/00-base.yml +++ b/tests/dictionaries_old/10fill_option_od_information/result/rougail/00-base.yml @@ -17,4 +17,4 @@ general: type: string description: No change mandatory: false -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/10fill_target_information/result/rougail/00-base.yml b/tests/dictionaries_old/10fill_target_information/result/rougail/00-base.yml index 30cb1e5bc..e1a6d8a3b 100644 --- a/tests/dictionaries_old/10fill_target_information/result/rougail/00-base.yml +++ b/tests/dictionaries_old/10fill_target_information/result/rougail/00-base.yml @@ -12,4 +12,4 @@ general: type: information information: test_information variable: rougail.general.mode_conteneur_actif -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/10frozenifin_unknown_valid_enum_number/result/rougail/00-base.yml b/tests/dictionaries_old/10frozenifin_unknown_valid_enum_number/result/rougail/00-base.yml index 295ed6f10..b11eb6b45 100644 --- a/tests/dictionaries_old/10frozenifin_unknown_valid_enum_number/result/rougail/00-base.yml +++ b/tests/dictionaries_old/10frozenifin_unknown_valid_enum_number/result/rougail/00-base.yml @@ -21,5 +21,5 @@ enumfam: mandatory: false hidden: type: jinja - jinja: '{% if rougail.enumfam.enumvar == "4" %}true{% else %}false{% endif %}' -version: '1.0' + jinja: '{% if rougail.enumfam.enumvar == "4" %}hidden{% endif %}' +version: '1.1' diff --git a/tests/dictionaries_old/10leadership_append/result/rougail/00-base.yml b/tests/dictionaries_old/10leadership_append/result/rougail/00-base.yml index 89b7fd3ff..cd1d19335 100644 --- a/tests/dictionaries_old/10leadership_append/result/rougail/00-base.yml +++ b/tests/dictionaries_old/10leadership_append/result/rougail/00-base.yml @@ -26,4 +26,4 @@ general1: default: type: jinja jinja: '{{ rougail.general1.leader.follower1 | calc_val }}' -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/10leadership_append/result/rougail/01-base.yml b/tests/dictionaries_old/10leadership_append/result/rougail/01-base.yml index 00b4fd28d..34530bde0 100644 --- a/tests/dictionaries_old/10leadership_append/result/rougail/01-base.yml +++ b/tests/dictionaries_old/10leadership_append/result/rougail/01-base.yml @@ -4,4 +4,4 @@ general1: type: string description: follower3 mandatory: false -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/10leadership_append_hidden/result/rougail/00-base.yml b/tests/dictionaries_old/10leadership_append_hidden/result/rougail/00-base.yml index ad49e4472..34bc2b0c3 100644 --- a/tests/dictionaries_old/10leadership_append_hidden/result/rougail/00-base.yml +++ b/tests/dictionaries_old/10leadership_append_hidden/result/rougail/00-base.yml @@ -27,4 +27,4 @@ general1: default: type: jinja jinja: '{{ rougail.general1.leader.follower1 | calc_val }}' -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/10leadership_append_hidden/result/rougail/01-base.yml b/tests/dictionaries_old/10leadership_append_hidden/result/rougail/01-base.yml index 00b4fd28d..34530bde0 100644 --- a/tests/dictionaries_old/10leadership_append_hidden/result/rougail/01-base.yml +++ b/tests/dictionaries_old/10leadership_append_hidden/result/rougail/01-base.yml @@ -4,4 +4,4 @@ general1: type: string description: follower3 mandatory: false -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/10leadership_append_name/result/rougail/00-base.yml b/tests/dictionaries_old/10leadership_append_name/result/rougail/00-base.yml index 6e4e84c72..2e3c4ddcf 100644 --- a/tests/dictionaries_old/10leadership_append_name/result/rougail/00-base.yml +++ b/tests/dictionaries_old/10leadership_append_name/result/rougail/00-base.yml @@ -26,4 +26,4 @@ general1: default: type: jinja jinja: '{{ rougail.general1.leadership.follower1 | calc_val }}' -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/10leadership_append_name/result/rougail/01-base.yml b/tests/dictionaries_old/10leadership_append_name/result/rougail/01-base.yml index b8e688d1c..91c8f4489 100644 --- a/tests/dictionaries_old/10leadership_append_name/result/rougail/01-base.yml +++ b/tests/dictionaries_old/10leadership_append_name/result/rougail/01-base.yml @@ -4,4 +4,4 @@ general1: type: string description: follower3 mandatory: false -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/10leadership_auto/result/rougail/00-base.yml b/tests/dictionaries_old/10leadership_auto/result/rougail/00-base.yml index 6aee56e51..6f9086f67 100644 --- a/tests/dictionaries_old/10leadership_auto/result/rougail/00-base.yml +++ b/tests/dictionaries_old/10leadership_auto/result/rougail/00-base.yml @@ -35,4 +35,4 @@ general: default: type: jinja jinja: '{{ rougail.general.leader.leader | calc_val }}' -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/10leadership_auto_index/result/rougail/00-base.yml b/tests/dictionaries_old/10leadership_auto_index/result/rougail/00-base.yml index 523b4f71f..b46edca55 100644 --- a/tests/dictionaries_old/10leadership_auto_index/result/rougail/00-base.yml +++ b/tests/dictionaries_old/10leadership_auto_index/result/rougail/00-base.yml @@ -16,4 +16,4 @@ leader: params: __index: type: index -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/10leadership_autoleader/result/rougail/00-base.yml b/tests/dictionaries_old/10leadership_autoleader/result/rougail/00-base.yml index 1d3261d50..7d9e2e1c5 100644 --- a/tests/dictionaries_old/10leadership_autoleader/result/rougail/00-base.yml +++ b/tests/dictionaries_old/10leadership_autoleader/result/rougail/00-base.yml @@ -27,4 +27,4 @@ general: default: type: jinja jinja: '{{ rougail.general.leader.leader | calc_val }}' -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/10leadership_autoleader_expert/result/rougail/00-base.yml b/tests/dictionaries_old/10leadership_autoleader_expert/result/rougail/00-base.yml index 2da133e7c..5fd2f3419 100644 --- a/tests/dictionaries_old/10leadership_autoleader_expert/result/rougail/00-base.yml +++ b/tests/dictionaries_old/10leadership_autoleader_expert/result/rougail/00-base.yml @@ -25,4 +25,4 @@ leadermode: type: string description: follower2 mandatory: false -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/10leadership_autosaveexpert/result/rougail/00-base.yml b/tests/dictionaries_old/10leadership_autosaveexpert/result/rougail/00-base.yml index adc8762cf..1172a93cd 100644 --- a/tests/dictionaries_old/10leadership_autosaveexpert/result/rougail/00-base.yml +++ b/tests/dictionaries_old/10leadership_autosaveexpert/result/rougail/00-base.yml @@ -26,4 +26,4 @@ general: default: type: jinja jinja: '{{ rougail.general.leader.follower1 | calc_val }}' -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/10leadership_empty/result/rougail/00_base.yml b/tests/dictionaries_old/10leadership_empty/result/rougail/00_base.yml index 9f7d9a728..b00388f4f 100644 --- a/tests/dictionaries_old/10leadership_empty/result/rougail/00_base.yml +++ b/tests/dictionaries_old/10leadership_empty/result/rougail/00_base.yml @@ -1,3 +1,3 @@ empty_leader: type: leadership -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/10leadership_empty/result/services/00_base.yml b/tests/dictionaries_old/10leadership_empty/result/services/00_base.yml index c68a20606..8b6e1feff 100644 --- a/tests/dictionaries_old/10leadership_empty/result/services/00_base.yml +++ b/tests/dictionaries_old/10leadership_empty/result/services/00_base.yml @@ -1,2 +1,2 @@ tata.service: {} -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/10leadership_hidden/result/rougail/00-base.yml b/tests/dictionaries_old/10leadership_hidden/result/rougail/00-base.yml index 9678ec79d..ed77ad9f4 100644 --- a/tests/dictionaries_old/10leadership_hidden/result/rougail/00-base.yml +++ b/tests/dictionaries_old/10leadership_hidden/result/rougail/00-base.yml @@ -25,4 +25,4 @@ leadermode: type: string description: follower2 mandatory: false -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/10leadership_leader_hidden/result/rougail/00-base.yml b/tests/dictionaries_old/10leadership_leader_hidden/result/rougail/00-base.yml index f243aa6e0..9fb32ac45 100644 --- a/tests/dictionaries_old/10leadership_leader_hidden/result/rougail/00-base.yml +++ b/tests/dictionaries_old/10leadership_leader_hidden/result/rougail/00-base.yml @@ -25,4 +25,4 @@ leadermode: type: string description: follower2 mandatory: false -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/10leadership_leader_hidden_if_in/result/rougail/00-base.yml b/tests/dictionaries_old/10leadership_leader_hidden_if_in/result/rougail/00-base.yml index 7547766a0..529be144c 100644 --- a/tests/dictionaries_old/10leadership_leader_hidden_if_in/result/rougail/00-base.yml +++ b/tests/dictionaries_old/10leadership_leader_hidden_if_in/result/rougail/00-base.yml @@ -15,8 +15,8 @@ leadermode: mandatory: false hidden: type: jinja - jinja: '{% if rougail.general.mode_conteneur_actif == "non" %}true{% else - %}false{% endif %}' + jinja: '{% if rougail.general.mode_conteneur_actif == "non" %}hidden{% endif + %}' follower1: type: string description: follower1 @@ -25,4 +25,4 @@ leadermode: type: string description: follower2 mandatory: false -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/10leadership_leader_hidden_if_in_name/result/rougail/00-base.yml b/tests/dictionaries_old/10leadership_leader_hidden_if_in_name/result/rougail/00-base.yml index 165513739..8c5162b41 100644 --- a/tests/dictionaries_old/10leadership_leader_hidden_if_in_name/result/rougail/00-base.yml +++ b/tests/dictionaries_old/10leadership_leader_hidden_if_in_name/result/rougail/00-base.yml @@ -15,8 +15,8 @@ leadermode: mandatory: false hidden: type: jinja - jinja: '{% if rougail.general.mode_conteneur_actif == "non" %}true{% else - %}false{% endif %}' + jinja: '{% if rougail.general.mode_conteneur_actif == "non" %}hidden{% endif + %}' follower1: type: string description: follower1 @@ -25,4 +25,4 @@ leadermode: type: string description: follower2 mandatory: false -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/10leadership_leadermandatory/result/rougail/00-base.yml b/tests/dictionaries_old/10leadership_leadermandatory/result/rougail/00-base.yml index b86bee334..2aa941177 100644 --- a/tests/dictionaries_old/10leadership_leadermandatory/result/rougail/00-base.yml +++ b/tests/dictionaries_old/10leadership_leadermandatory/result/rougail/00-base.yml @@ -25,4 +25,4 @@ general: default: type: jinja jinja: '{{ rougail.general.leader.follower1 | calc_val }}' -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/10leadership_mandatoryfollower/result/rougail/00-base.yml b/tests/dictionaries_old/10leadership_mandatoryfollower/result/rougail/00-base.yml index 017177435..2c7864558 100644 --- a/tests/dictionaries_old/10leadership_mandatoryfollower/result/rougail/00-base.yml +++ b/tests/dictionaries_old/10leadership_mandatoryfollower/result/rougail/00-base.yml @@ -17,4 +17,4 @@ general: type: network description: Adresse IP du réseau de l'esclave mandatory: true -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/10leadership_mandatoryfollower_value/result/rougail/00-base.yml b/tests/dictionaries_old/10leadership_mandatoryfollower_value/result/rougail/00-base.yml index 8af90dcc5..ad58c1728 100644 --- a/tests/dictionaries_old/10leadership_mandatoryfollower_value/result/rougail/00-base.yml +++ b/tests/dictionaries_old/10leadership_mandatoryfollower_value/result/rougail/00-base.yml @@ -18,4 +18,4 @@ general: description: Adresse IP du réseau de l'esclave mandatory: true default: 192.168.0.0 -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/10leadership_multi/result/rougail/00-base.yml b/tests/dictionaries_old/10leadership_multi/result/rougail/00-base.yml index e38dd0fd8..a73c793e6 100644 --- a/tests/dictionaries_old/10leadership_multi/result/rougail/00-base.yml +++ b/tests/dictionaries_old/10leadership_multi/result/rougail/00-base.yml @@ -42,4 +42,4 @@ general1: type: string description: follower2 mandatory: false -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/10load_disabled_if_in/result/rougail/00-base.yml b/tests/dictionaries_old/10load_disabled_if_in/result/rougail/00-base.yml index 354f25437..b2fc6dc3e 100644 --- a/tests/dictionaries_old/10load_disabled_if_in/result/rougail/00-base.yml +++ b/tests/dictionaries_old/10load_disabled_if_in/result/rougail/00-base.yml @@ -10,8 +10,7 @@ general: default: non disabled: type: jinja - jinja: '{% if rougail.general.condition == "oui" %}true{% else %}false{% endif - %}' + jinja: '{% if rougail.general.condition == "oui" %}disabled{% endif %}' mode_conteneur_actif2: type: string description: No change @@ -19,6 +18,5 @@ general: default: non disabled: type: jinja - jinja: '{% if rougail.general.condition == "oui" %}true{% else %}false{% endif - %}' -version: '1.0' + jinja: '{% if rougail.general.condition == "oui" %}disabled{% endif %}' +version: '1.1' diff --git a/tests/dictionaries_old/10load_disabled_if_in_fill/result/rougail/00-base.yml b/tests/dictionaries_old/10load_disabled_if_in_fill/result/rougail/00-base.yml index dcd533f5a..663780f5d 100644 --- a/tests/dictionaries_old/10load_disabled_if_in_fill/result/rougail/00-base.yml +++ b/tests/dictionaries_old/10load_disabled_if_in_fill/result/rougail/00-base.yml @@ -7,8 +7,7 @@ general: mandatory: false disabled: type: jinja - jinja: '{% if rougail.general.condition == "no" %}true{% else %}false{% endif - %}' + jinja: '{% if rougail.general.condition == "no" %}disabled{% endif %}' variable2: type: string mandatory: false @@ -20,4 +19,4 @@ general: type: variable variable: rougail.general.variable1 propertyerror: false -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/10load_disabled_if_in_list_optional/result/rougail/00-base.yml b/tests/dictionaries_old/10load_disabled_if_in_list_optional/result/rougail/00-base.yml index 5b42c2211..3142ccc6d 100644 --- a/tests/dictionaries_old/10load_disabled_if_in_list_optional/result/rougail/00-base.yml +++ b/tests/dictionaries_old/10load_disabled_if_in_list_optional/result/rougail/00-base.yml @@ -1,3 +1,3 @@ condition: type: boolean -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/10load_disabled_if_in_multi_param/result/rougail/00-base.yml b/tests/dictionaries_old/10load_disabled_if_in_multi_param/result/rougail/00-base.yml index bd5a3dffd..1ec03a0fd 100644 --- a/tests/dictionaries_old/10load_disabled_if_in_multi_param/result/rougail/00-base.yml +++ b/tests/dictionaries_old/10load_disabled_if_in_multi_param/result/rougail/00-base.yml @@ -11,7 +11,7 @@ general: disabled: type: jinja jinja: '{% if rougail.general.condition == "oui" or rougail.general.condition - == "maybe" %}true{% else %}false{% endif %}' + == "maybe" %}disabled{% endif %}' mode_conteneur_actif2: type: string description: No change @@ -20,5 +20,5 @@ general: disabled: type: jinja jinja: '{% if rougail.general.condition == "oui" or rougail.general.condition - == "maybe" %}true{% else %}false{% endif %}' -version: '1.0' + == "maybe" %}disabled{% endif %}' +version: '1.1' diff --git a/tests/dictionaries_old/10load_disabled_if_in_multi_param/result/services/00-base.yml b/tests/dictionaries_old/10load_disabled_if_in_multi_param/result/services/00-base.yml index 6abe5cc6a..9e1cc6446 100644 --- a/tests/dictionaries_old/10load_disabled_if_in_multi_param/result/services/00-base.yml +++ b/tests/dictionaries_old/10load_disabled_if_in_multi_param/result/services/00-base.yml @@ -4,5 +4,5 @@ test.service: disabled: type: jinja jinja: '{% if rougail.general.condition == "oui" or rougail.general.condition - == "maybe" %}true{% else %}false{% endif %}' -version: '1.0' + == "maybe" %}disabled{% endif %}' +version: '1.1' diff --git a/tests/dictionaries_old/10load_disabled_if_in_multi_param2/result/rougail/00-base.yml b/tests/dictionaries_old/10load_disabled_if_in_multi_param2/result/rougail/00-base.yml index 2f360f004..08974a0b1 100644 --- a/tests/dictionaries_old/10load_disabled_if_in_multi_param2/result/rougail/00-base.yml +++ b/tests/dictionaries_old/10load_disabled_if_in_multi_param2/result/rougail/00-base.yml @@ -15,5 +15,5 @@ general: disabled: type: jinja jinja: '{% if rougail.general.condition2 == "yes" or rougail.general.condition2 - == "maybe" %}true{% else %}false{% endif %}' -version: '1.0' + == "maybe" %}disabled{% endif %}' +version: '1.1' diff --git a/tests/dictionaries_old/10load_disabled_if_in_multi_param2/result/services/00-base.yml b/tests/dictionaries_old/10load_disabled_if_in_multi_param2/result/services/00-base.yml index beb053e5c..e094b83aa 100644 --- a/tests/dictionaries_old/10load_disabled_if_in_multi_param2/result/services/00-base.yml +++ b/tests/dictionaries_old/10load_disabled_if_in_multi_param2/result/services/00-base.yml @@ -4,5 +4,5 @@ test.service: disabled: type: jinja jinja: '{% if rougail.general.condition == "yes" or rougail.general.condition - == "maybe" %}true{% else %}false{% endif %}' -version: '1.0' + == "maybe" %}disabled{% endif %}' +version: '1.1' diff --git a/tests/dictionaries_old/10load_disabled_if_in_multi_param3/result/rougail/00-base.yml b/tests/dictionaries_old/10load_disabled_if_in_multi_param3/result/rougail/00-base.yml index 2f360f004..08974a0b1 100644 --- a/tests/dictionaries_old/10load_disabled_if_in_multi_param3/result/rougail/00-base.yml +++ b/tests/dictionaries_old/10load_disabled_if_in_multi_param3/result/rougail/00-base.yml @@ -15,5 +15,5 @@ general: disabled: type: jinja jinja: '{% if rougail.general.condition2 == "yes" or rougail.general.condition2 - == "maybe" %}true{% else %}false{% endif %}' -version: '1.0' + == "maybe" %}disabled{% endif %}' +version: '1.1' diff --git a/tests/dictionaries_old/10load_disabled_if_in_multi_param3/result/services/00-base.yml b/tests/dictionaries_old/10load_disabled_if_in_multi_param3/result/services/00-base.yml index 16c140073..84fe53e0f 100644 --- a/tests/dictionaries_old/10load_disabled_if_in_multi_param3/result/services/00-base.yml +++ b/tests/dictionaries_old/10load_disabled_if_in_multi_param3/result/services/00-base.yml @@ -4,5 +4,5 @@ test.service: disabled: type: jinja jinja: '{% if rougail.general.condition == "yes" or rougail.general.condition - == "maybe" %}false{% else %}true{% endif %}' -version: '1.0' + == "maybe" %}{% else %}disabled{% endif %}' +version: '1.1' diff --git a/tests/dictionaries_old/10load_disabled_if_in_multi_param4/result/rougail/00-base.yml b/tests/dictionaries_old/10load_disabled_if_in_multi_param4/result/rougail/00-base.yml index 8f2300cd1..6ba502643 100644 --- a/tests/dictionaries_old/10load_disabled_if_in_multi_param4/result/rougail/00-base.yml +++ b/tests/dictionaries_old/10load_disabled_if_in_multi_param4/result/rougail/00-base.yml @@ -15,5 +15,5 @@ general: disabled: type: jinja jinja: '{% if rougail.general.condition2 == "yes" or rougail.general.condition2 - == "maybe" %}true{% else %}false{% endif %}' -version: '1.0' + == "maybe" %}disabled{% endif %}' +version: '1.1' diff --git a/tests/dictionaries_old/10load_disabled_if_in_multi_param4/result/services/00-base.yml b/tests/dictionaries_old/10load_disabled_if_in_multi_param4/result/services/00-base.yml index 16c140073..84fe53e0f 100644 --- a/tests/dictionaries_old/10load_disabled_if_in_multi_param4/result/services/00-base.yml +++ b/tests/dictionaries_old/10load_disabled_if_in_multi_param4/result/services/00-base.yml @@ -4,5 +4,5 @@ test.service: disabled: type: jinja jinja: '{% if rougail.general.condition == "yes" or rougail.general.condition - == "maybe" %}false{% else %}true{% endif %}' -version: '1.0' + == "maybe" %}{% else %}disabled{% endif %}' +version: '1.1' diff --git a/tests/dictionaries_old/10load_disabled_if_in_multi_param5/result/rougail/00-base.yml b/tests/dictionaries_old/10load_disabled_if_in_multi_param5/result/rougail/00-base.yml index 1953204c3..99e47b195 100644 --- a/tests/dictionaries_old/10load_disabled_if_in_multi_param5/result/rougail/00-base.yml +++ b/tests/dictionaries_old/10load_disabled_if_in_multi_param5/result/rougail/00-base.yml @@ -15,5 +15,5 @@ general: disabled: type: jinja jinja: '{% if rougail.general.condition2 == "yes" or rougail.general.condition2 - == "maybe" %}true{% else %}false{% endif %}' -version: '1.0' + == "maybe" %}disabled{% endif %}' +version: '1.1' diff --git a/tests/dictionaries_old/10load_disabled_if_in_multi_param5/result/services/00-base.yml b/tests/dictionaries_old/10load_disabled_if_in_multi_param5/result/services/00-base.yml index 16c140073..84fe53e0f 100644 --- a/tests/dictionaries_old/10load_disabled_if_in_multi_param5/result/services/00-base.yml +++ b/tests/dictionaries_old/10load_disabled_if_in_multi_param5/result/services/00-base.yml @@ -4,5 +4,5 @@ test.service: disabled: type: jinja jinja: '{% if rougail.general.condition == "yes" or rougail.general.condition - == "maybe" %}false{% else %}true{% endif %}' -version: '1.0' + == "maybe" %}{% else %}disabled{% endif %}' +version: '1.1' diff --git a/tests/dictionaries_old/10load_disabled_if_in_multi_param6/result/rougail/00-base.yml b/tests/dictionaries_old/10load_disabled_if_in_multi_param6/result/rougail/00-base.yml index c610e80d4..9aab2ceab 100644 --- a/tests/dictionaries_old/10load_disabled_if_in_multi_param6/result/rougail/00-base.yml +++ b/tests/dictionaries_old/10load_disabled_if_in_multi_param6/result/rougail/00-base.yml @@ -15,5 +15,5 @@ general: disabled: type: jinja jinja: '{% if rougail.general.condition2 == "yes" or rougail.general.condition2 - == "maybe" %}true{% else %}false{% endif %}' -version: '1.0' + == "maybe" %}disabled{% endif %}' +version: '1.1' diff --git a/tests/dictionaries_old/10load_disabled_if_in_multi_param6/result/services/00-base.yml b/tests/dictionaries_old/10load_disabled_if_in_multi_param6/result/services/00-base.yml index 16c140073..84fe53e0f 100644 --- a/tests/dictionaries_old/10load_disabled_if_in_multi_param6/result/services/00-base.yml +++ b/tests/dictionaries_old/10load_disabled_if_in_multi_param6/result/services/00-base.yml @@ -4,5 +4,5 @@ test.service: disabled: type: jinja jinja: '{% if rougail.general.condition == "yes" or rougail.general.condition - == "maybe" %}false{% else %}true{% endif %}' -version: '1.0' + == "maybe" %}{% else %}disabled{% endif %}' +version: '1.1' diff --git a/tests/dictionaries_old/10load_disabled_if_in_multi_param_disabled/result/rougail/00-base.yml b/tests/dictionaries_old/10load_disabled_if_in_multi_param_disabled/result/rougail/00-base.yml index 7aff4ee1f..337e1652d 100644 --- a/tests/dictionaries_old/10load_disabled_if_in_multi_param_disabled/result/rougail/00-base.yml +++ b/tests/dictionaries_old/10load_disabled_if_in_multi_param_disabled/result/rougail/00-base.yml @@ -11,7 +11,7 @@ general: disabled: type: jinja jinja: '{% if rougail.general.condition == "oui" or rougail.general.condition - == "maybe" %}true{% else %}false{% endif %}' + == "maybe" %}disabled{% endif %}' mode_conteneur_actif2: type: string description: No change @@ -20,5 +20,5 @@ general: disabled: type: jinja jinja: '{% if rougail.general.condition == "oui" or rougail.general.condition - == "maybe" %}true{% else %}false{% endif %}' -version: '1.0' + == "maybe" %}disabled{% endif %}' +version: '1.1' diff --git a/tests/dictionaries_old/10load_disabled_if_in_multi_param_disabled/result/services/00-base.yml b/tests/dictionaries_old/10load_disabled_if_in_multi_param_disabled/result/services/00-base.yml index 6abe5cc6a..9e1cc6446 100644 --- a/tests/dictionaries_old/10load_disabled_if_in_multi_param_disabled/result/services/00-base.yml +++ b/tests/dictionaries_old/10load_disabled_if_in_multi_param_disabled/result/services/00-base.yml @@ -4,5 +4,5 @@ test.service: disabled: type: jinja jinja: '{% if rougail.general.condition == "oui" or rougail.general.condition - == "maybe" %}true{% else %}false{% endif %}' -version: '1.0' + == "maybe" %}disabled{% endif %}' +version: '1.1' diff --git a/tests/dictionaries_old/10load_disabled_if_in_none/result/rougail/00-base.yml b/tests/dictionaries_old/10load_disabled_if_in_none/result/rougail/00-base.yml index 70b006087..d7f8f3e7d 100644 --- a/tests/dictionaries_old/10load_disabled_if_in_none/result/rougail/00-base.yml +++ b/tests/dictionaries_old/10load_disabled_if_in_none/result/rougail/00-base.yml @@ -10,8 +10,7 @@ general: default: non disabled: type: jinja - jinja: '{% if rougail.general.condition == null %}true{% else %}false{% endif - %}' + jinja: '{% if rougail.general.condition == null %}disabled{% endif %}' mode_conteneur_actif2: type: string description: No change @@ -19,6 +18,5 @@ general: default: non disabled: type: jinja - jinja: '{% if rougail.general.condition == null %}true{% else %}false{% endif - %}' -version: '1.0' + jinja: '{% if rougail.general.condition == null %}disabled{% endif %}' +version: '1.1' diff --git a/tests/dictionaries_old/10load_disabled_if_in_twice/result/rougail/00-base.yml b/tests/dictionaries_old/10load_disabled_if_in_twice/result/rougail/00-base.yml index 4478f1cd3..7df60519f 100644 --- a/tests/dictionaries_old/10load_disabled_if_in_twice/result/rougail/00-base.yml +++ b/tests/dictionaries_old/10load_disabled_if_in_twice/result/rougail/00-base.yml @@ -4,10 +4,10 @@ my_var2: default: 'no' disabled: type: jinja - jinja: '{% if rougail.my_var1 == "no" %}true{% else %}false{% endif %}' + jinja: '{% if rougail.my_var1 == "no" %}disabled{% endif %}' my_var3: default: 'no' disabled: type: jinja - jinja: '{% if rougail.my_var2 == "no" %}true{% else %}false{% endif %}' -version: '1.0' + jinja: '{% if rougail.my_var2 == "no" %}disabled{% endif %}' +version: '1.1' diff --git a/tests/dictionaries_old/10load_disabled_if_in_variable/result/rougail/00-base.yml b/tests/dictionaries_old/10load_disabled_if_in_variable/result/rougail/00-base.yml index 439424a4a..29c924a41 100644 --- a/tests/dictionaries_old/10load_disabled_if_in_variable/result/rougail/00-base.yml +++ b/tests/dictionaries_old/10load_disabled_if_in_variable/result/rougail/00-base.yml @@ -18,5 +18,5 @@ general: disabled: type: jinja jinja: '{% if rougail.general.condition == rougail.general.mode_conteneur_actif - %}true{% else %}false{% endif %}' -version: '1.0' + %}disabled{% endif %}' +version: '1.1' diff --git a/tests/dictionaries_old/10load_disabled_if_in_variable2/result/rougail/00-base.yml b/tests/dictionaries_old/10load_disabled_if_in_variable2/result/rougail/00-base.yml index 7df5d7b3e..212af8550 100644 --- a/tests/dictionaries_old/10load_disabled_if_in_variable2/result/rougail/00-base.yml +++ b/tests/dictionaries_old/10load_disabled_if_in_variable2/result/rougail/00-base.yml @@ -18,5 +18,5 @@ general: disabled: type: jinja jinja: '{% if rougail.general.condition == rougail.general.mode_conteneur_actif - %}true{% else %}false{% endif %}' -version: '1.0' + %}disabled{% endif %}' +version: '1.1' diff --git a/tests/dictionaries_old/10load_disabled_if_not_in_fallback/result/rougail/00-base.yml b/tests/dictionaries_old/10load_disabled_if_not_in_fallback/result/rougail/00-base.yml index f1987cb8d..8b3cd43e0 100644 --- a/tests/dictionaries_old/10load_disabled_if_not_in_fallback/result/rougail/00-base.yml +++ b/tests/dictionaries_old/10load_disabled_if_not_in_fallback/result/rougail/00-base.yml @@ -9,5 +9,5 @@ general: default: 'no' disabled: type: jinja - jinja: '{% if __unknown == "no" %}false{% else %}true{% endif %}' -version: '1.0' + jinja: '{% if __unknown == "no" %}{% else %}disabled{% endif %}' +version: '1.1' diff --git a/tests/dictionaries_old/10load_disabled_if_not_in_fallback/result/services/00-base.yml b/tests/dictionaries_old/10load_disabled_if_not_in_fallback/result/services/00-base.yml index a74358c25..4801ddf43 100644 --- a/tests/dictionaries_old/10load_disabled_if_not_in_fallback/result/services/00-base.yml +++ b/tests/dictionaries_old/10load_disabled_if_not_in_fallback/result/services/00-base.yml @@ -3,5 +3,5 @@ test.service: /tmp/file1: disabled: type: jinja - jinja: '{% if __unknown == "no" %}false{% else %}true{% endif %}' -version: '1.0' + jinja: '{% if __unknown == "no" %}{% else %}disabled{% endif %}' +version: '1.1' diff --git a/tests/dictionaries_old/10load_disabled_if_not_in_fallback_force/result/rougail/00-base.yml b/tests/dictionaries_old/10load_disabled_if_not_in_fallback_force/result/rougail/00-base.yml index df2bf7dbf..8745285ec 100644 --- a/tests/dictionaries_old/10load_disabled_if_not_in_fallback_force/result/rougail/00-base.yml +++ b/tests/dictionaries_old/10load_disabled_if_not_in_fallback_force/result/rougail/00-base.yml @@ -9,10 +9,10 @@ general: default: non disabled: type: jinja - jinja: '{% if __activer_client_ldap == "non" %}false{% else %}true{% endif %}' + jinja: '{% if __activer_client_ldap == "non" %}{% else %}disabled{% endif %}' mode_conteneur_actif2: type: string description: No change default: non disabled: true -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/10load_disabledifin_fallback/result/rougail/00-base.yml b/tests/dictionaries_old/10load_disabledifin_fallback/result/rougail/00-base.yml index 91d61f007..7b63111b3 100644 --- a/tests/dictionaries_old/10load_disabledifin_fallback/result/rougail/00-base.yml +++ b/tests/dictionaries_old/10load_disabledifin_fallback/result/rougail/00-base.yml @@ -9,13 +9,12 @@ general: default: non disabled: type: jinja - jinja: '{% if __activer_client_ldap == "non" %}true{% else %}false{% endif %}' + jinja: '{% if __activer_client_ldap == "non" %}disabled{% endif %}' mode_conteneur_actif2: type: string description: No change default: non disabled: type: jinja - jinja: '{% if rougail.general.condition == "oui" %}true{% else %}false{% endif - %}' -version: '1.0' + jinja: '{% if rougail.general.condition == "oui" %}disabled{% endif %}' +version: '1.1' diff --git a/tests/dictionaries_old/10load_disabledifin_fallback_force/result/rougail/00-base.yml b/tests/dictionaries_old/10load_disabledifin_fallback_force/result/rougail/00-base.yml index 91d61f007..7b63111b3 100644 --- a/tests/dictionaries_old/10load_disabledifin_fallback_force/result/rougail/00-base.yml +++ b/tests/dictionaries_old/10load_disabledifin_fallback_force/result/rougail/00-base.yml @@ -9,13 +9,12 @@ general: default: non disabled: type: jinja - jinja: '{% if __activer_client_ldap == "non" %}true{% else %}false{% endif %}' + jinja: '{% if __activer_client_ldap == "non" %}disabled{% endif %}' mode_conteneur_actif2: type: string description: No change default: non disabled: type: jinja - jinja: '{% if rougail.general.condition == "oui" %}true{% else %}false{% endif - %}' -version: '1.0' + jinja: '{% if rougail.general.condition == "oui" %}disabled{% endif %}' +version: '1.1' diff --git a/tests/dictionaries_old/10load_disabledifin_whithouttype/result/rougail/00-base.yml b/tests/dictionaries_old/10load_disabledifin_whithouttype/result/rougail/00-base.yml index 57453550e..fb681e03f 100644 --- a/tests/dictionaries_old/10load_disabledifin_whithouttype/result/rougail/00-base.yml +++ b/tests/dictionaries_old/10load_disabledifin_whithouttype/result/rougail/00-base.yml @@ -9,14 +9,12 @@ general: default: non disabled: type: jinja - jinja: '{% if rougail.general.condition == "oui" %}true{% else %}false{% endif - %}' + jinja: '{% if rougail.general.condition == "oui" %}disabled{% endif %}' mode_conteneur_actif2: type: string description: No change default: non disabled: type: jinja - jinja: '{% if rougail.general.condition == "oui" %}true{% else %}false{% endif - %}' -version: '1.0' + jinja: '{% if rougail.general.condition == "oui" %}disabled{% endif %}' +version: '1.1' diff --git a/tests/dictionaries_old/10load_frozenifin/result/rougail/00-base.yml b/tests/dictionaries_old/10load_frozenifin/result/rougail/00-base.yml index 191b34379..a0c3700cb 100644 --- a/tests/dictionaries_old/10load_frozenifin/result/rougail/00-base.yml +++ b/tests/dictionaries_old/10load_frozenifin/result/rougail/00-base.yml @@ -9,14 +9,12 @@ general: default: non hidden: type: jinja - jinja: '{% if rougail.general.condition == "oui" %}true{% else %}false{% endif - %}' + jinja: '{% if rougail.general.condition == "oui" %}hidden{% endif %}' mode_conteneur_actif2: type: string description: No change default: non hidden: type: jinja - jinja: '{% if rougail.general.condition == "oui" %}true{% else %}false{% endif - %}' -version: '1.0' + jinja: '{% if rougail.general.condition == "oui" %}hidden{% endif %}' +version: '1.1' diff --git a/tests/dictionaries_old/10load_frozenifin_auto/result/rougail/00-base.yml b/tests/dictionaries_old/10load_frozenifin_auto/result/rougail/00-base.yml index c4e09ad10..66afe8512 100644 --- a/tests/dictionaries_old/10load_frozenifin_auto/result/rougail/00-base.yml +++ b/tests/dictionaries_old/10load_frozenifin_auto/result/rougail/00-base.yml @@ -11,14 +11,12 @@ general: jinja: '{{ "non" | calc_val }}' hidden: type: jinja - jinja: '{% if rougail.general.condition == "oui" %}true{% else %}false{% endif - %}' + jinja: '{% if rougail.general.condition == "oui" %}hidden{% endif %}' mode_conteneur_actif2: type: string description: No change default: non hidden: type: jinja - jinja: '{% if rougail.general.condition == "oui" %}true{% else %}false{% endif - %}' -version: '1.0' + jinja: '{% if rougail.general.condition == "oui" %}hidden{% endif %}' +version: '1.1' diff --git a/tests/dictionaries_old/10load_frozenifin_multiparam/result/rougail/00-base.yml b/tests/dictionaries_old/10load_frozenifin_multiparam/result/rougail/00-base.yml index 56959df42..ac77f52e2 100644 --- a/tests/dictionaries_old/10load_frozenifin_multiparam/result/rougail/00-base.yml +++ b/tests/dictionaries_old/10load_frozenifin_multiparam/result/rougail/00-base.yml @@ -14,7 +14,7 @@ general: hidden: type: jinja jinja: '{% if rougail.general.condition == "tous" or rougail.general.condition - == "authentifié" %}true{% else %}false{% endif %}' + == "authentifié" %}hidden{% endif %}' mode_conteneur_actif2: type: string description: No change @@ -22,5 +22,5 @@ general: hidden: type: jinja jinja: '{% if rougail.general.condition == "tous" or rougail.general.condition - == "authentifié" %}true{% else %}false{% endif %}' -version: '1.0' + == "authentifié" %}hidden{% endif %}' +version: '1.1' diff --git a/tests/dictionaries_old/10load_frozenifin_noexist/result/rougail/00-base.yml b/tests/dictionaries_old/10load_frozenifin_noexist/result/rougail/00-base.yml index 264aa7773..0ecea6f8d 100644 --- a/tests/dictionaries_old/10load_frozenifin_noexist/result/rougail/00-base.yml +++ b/tests/dictionaries_old/10load_frozenifin_noexist/result/rougail/00-base.yml @@ -13,7 +13,7 @@ general: hidden: type: jinja jinja: '{% if rougail.general.condition == "oui" or rougail.general.condition - == "non" %}true{% else %}false{% endif %}' + == "non" %}hidden{% endif %}' default: non mode_conteneur_actif2: type: string @@ -21,6 +21,6 @@ general: hidden: type: jinja jinja: '{% if rougail.general.condition == "oui" or rougail.general.condition - == "non" %}true{% else %}false{% endif %}' + == "non" %}hidden{% endif %}' default: non -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/10load_frozenifin_variable/result/rougail/00-base.yml b/tests/dictionaries_old/10load_frozenifin_variable/result/rougail/00-base.yml index 376abb295..2ebcd513c 100644 --- a/tests/dictionaries_old/10load_frozenifin_variable/result/rougail/00-base.yml +++ b/tests/dictionaries_old/10load_frozenifin_variable/result/rougail/00-base.yml @@ -18,5 +18,5 @@ general: hidden: type: jinja jinja: '{% if rougail.general.condition == rougail.general.mode_conteneur_actif - %}true{% else %}false{% endif %}' -version: '1.0' + %}hidden{% endif %}' +version: '1.1' diff --git a/tests/dictionaries_old/10load_frozenifnotin/result/rougail/00-base.yml b/tests/dictionaries_old/10load_frozenifnotin/result/rougail/00-base.yml index 30f71cedb..dce45d877 100644 --- a/tests/dictionaries_old/10load_frozenifnotin/result/rougail/00-base.yml +++ b/tests/dictionaries_old/10load_frozenifnotin/result/rougail/00-base.yml @@ -9,7 +9,7 @@ general: default: non hidden: type: jinja - jinja: '{% if rougail.general.condition == "oui" %}false{% else %}true{% endif + jinja: '{% if rougail.general.condition == "oui" %}{% else %}hidden{% endif %}' mode_conteneur_actif2: type: string @@ -17,6 +17,6 @@ general: default: non hidden: type: jinja - jinja: '{% if rougail.general.condition == "oui" %}false{% else %}true{% endif + jinja: '{% if rougail.general.condition == "oui" %}{% else %}hidden{% endif %}' -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/10load_frozenifnotin_noexist/result/rougail/00-base.yml b/tests/dictionaries_old/10load_frozenifnotin_noexist/result/rougail/00-base.yml index 19f7fa666..9e42a4bef 100644 --- a/tests/dictionaries_old/10load_frozenifnotin_noexist/result/rougail/00-base.yml +++ b/tests/dictionaries_old/10load_frozenifnotin_noexist/result/rougail/00-base.yml @@ -14,7 +14,7 @@ general: hidden: type: jinja jinja: '{% if rougail.general.condition == "oui" or rougail.general.condition - == "non" %}false{% else %}true{% endif %}' + == "non" %}{% else %}hidden{% endif %}' mode_conteneur_actif2: type: string description: No change @@ -22,5 +22,5 @@ general: hidden: type: jinja jinja: '{% if rougail.general.condition == "oui" or rougail.general.condition - == "non" %}false{% else %}true{% endif %}' -version: '1.0' + == "non" %}{% else %}hidden{% endif %}' +version: '1.1' diff --git a/tests/dictionaries_old/10load_hidden_if_empty_family/result/rougail/00-base.yml b/tests/dictionaries_old/10load_hidden_if_empty_family/result/rougail/00-base.yml index 38ba06fcb..03b6d4ada 100644 --- a/tests/dictionaries_old/10load_hidden_if_empty_family/result/rougail/00-base.yml +++ b/tests/dictionaries_old/10load_hidden_if_empty_family/result/rougail/00-base.yml @@ -10,20 +10,17 @@ general: default: non hidden: type: jinja - jinja: '{% if rougail.general.condition == "oui" %}true{% else %}false{% endif - %}' + jinja: '{% if rougail.general.condition == "oui" %}hidden{% endif %}' mode_conteneur_actif2: type: string description: No change default: non hidden: type: jinja - jinja: '{% if rougail.general.condition == "oui" %}true{% else %}false{% endif - %}' + jinja: '{% if rougail.general.condition == "oui" %}hidden{% endif %}' general2: description: Général2 hidden: type: jinja - jinja: '{% if rougail.general.condition == "oui" %}true{% else %}false{% endif - %}' -version: '1.0' + jinja: '{% if rougail.general.condition == "oui" %}hidden{% endif %}' +version: '1.1' diff --git a/tests/dictionaries_old/10load_hidden_if_family/result/rougail/00-base.yml b/tests/dictionaries_old/10load_hidden_if_family/result/rougail/00-base.yml index 306f00a1f..db203722e 100644 --- a/tests/dictionaries_old/10load_hidden_if_family/result/rougail/00-base.yml +++ b/tests/dictionaries_old/10load_hidden_if_family/result/rougail/00-base.yml @@ -10,16 +10,14 @@ general: default: non hidden: type: jinja - jinja: '{% if rougail.general.condition == "oui" %}true{% else %}false{% endif - %}' + jinja: '{% if rougail.general.condition == "oui" %}hidden{% endif %}' mode_conteneur_actif2: type: string description: No change default: non hidden: type: jinja - jinja: '{% if rougail.general.condition == "oui" %}true{% else %}false{% endif - %}' + jinja: '{% if rougail.general.condition == "oui" %}hidden{% endif %}' general2: description: Général2 mode_conteneur_actif3: @@ -29,6 +27,5 @@ general2: default: non hidden: type: jinja - jinja: '{% if rougail.general.condition == "oui" %}true{% else %}false{% endif - %}' -version: '1.0' + jinja: '{% if rougail.general.condition == "oui" %}hidden{% endif %}' +version: '1.1' diff --git a/tests/dictionaries_old/10load_leadership/result/rougail/00-base.yml b/tests/dictionaries_old/10load_leadership/result/rougail/00-base.yml index 89b7fd3ff..cd1d19335 100644 --- a/tests/dictionaries_old/10load_leadership/result/rougail/00-base.yml +++ b/tests/dictionaries_old/10load_leadership/result/rougail/00-base.yml @@ -26,4 +26,4 @@ general1: default: type: jinja jinja: '{{ rougail.general1.leader.follower1 | calc_val }}' -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/10load_leadership_default_multi/result/rougail/00-base.yml b/tests/dictionaries_old/10load_leadership_default_multi/result/rougail/00-base.yml index b72146dda..66fcca4dc 100644 --- a/tests/dictionaries_old/10load_leadership_default_multi/result/rougail/00-base.yml +++ b/tests/dictionaries_old/10load_leadership_default_multi/result/rougail/00-base.yml @@ -21,4 +21,4 @@ general: type: string description: follower2 mandatory: false -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/10load_leadership_default_submulti/result/rougail/00-base.yml b/tests/dictionaries_old/10load_leadership_default_submulti/result/rougail/00-base.yml index 1d2bcef7f..1b9225826 100644 --- a/tests/dictionaries_old/10load_leadership_default_submulti/result/rougail/00-base.yml +++ b/tests/dictionaries_old/10load_leadership_default_submulti/result/rougail/00-base.yml @@ -27,4 +27,4 @@ general: default: - value1 - value2 -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/10load_leadership_defaultmulti_leader/result/rougail/00-base.yml b/tests/dictionaries_old/10load_leadership_defaultmulti_leader/result/rougail/00-base.yml index 1ec3f1dab..b89f984b1 100644 --- a/tests/dictionaries_old/10load_leadership_defaultmulti_leader/result/rougail/00-base.yml +++ b/tests/dictionaries_old/10load_leadership_defaultmulti_leader/result/rougail/00-base.yml @@ -22,4 +22,4 @@ general: type: string description: follower2 mandatory: false -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/10load_leadership_description/result/rougail/00-base.yml b/tests/dictionaries_old/10load_leadership_description/result/rougail/00-base.yml index cd1f54207..80cc4e357 100644 --- a/tests/dictionaries_old/10load_leadership_description/result/rougail/00-base.yml +++ b/tests/dictionaries_old/10load_leadership_description/result/rougail/00-base.yml @@ -26,4 +26,4 @@ general1: default: type: jinja jinja: '{{ rougail.general1.leader.follower1 | calc_val }}' -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/10load_leadership_name/result/rougail/00-base.yml b/tests/dictionaries_old/10load_leadership_name/result/rougail/00-base.yml index 791eb8248..24f1a3a88 100644 --- a/tests/dictionaries_old/10load_leadership_name/result/rougail/00-base.yml +++ b/tests/dictionaries_old/10load_leadership_name/result/rougail/00-base.yml @@ -26,4 +26,4 @@ general1: default: type: jinja jinja: '{{ rougail.general1.other_name.follower1 | calc_val }}' -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/10load_leadership_submulti/result/rougail/00-base.yml b/tests/dictionaries_old/10load_leadership_submulti/result/rougail/00-base.yml index 2685fdce7..ca9b69116 100644 --- a/tests/dictionaries_old/10load_leadership_submulti/result/rougail/00-base.yml +++ b/tests/dictionaries_old/10load_leadership_submulti/result/rougail/00-base.yml @@ -27,4 +27,4 @@ general1: default: type: jinja jinja: '{{ rougail.general1.leader.follower1 | calc_val }}' -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/10load_mandatoryifin/result/rougail/00-base.yml b/tests/dictionaries_old/10load_mandatoryifin/result/rougail/00-base.yml index 67737342b..4dd8e55ab 100644 --- a/tests/dictionaries_old/10load_mandatoryifin/result/rougail/00-base.yml +++ b/tests/dictionaries_old/10load_mandatoryifin/result/rougail/00-base.yml @@ -9,14 +9,12 @@ general: default: non mandatory: type: jinja - jinja: '{% if rougail.general.condition == "oui" %}true{% else %}false{% endif - %}' + jinja: '{% if rougail.general.condition == "oui" %}mandatory{% endif %}' mode_conteneur_actif2: type: string description: No change default: non mandatory: type: jinja - jinja: '{% if rougail.general.condition == "oui" %}true{% else %}false{% endif - %}' -version: '1.0' + jinja: '{% if rougail.general.condition == "oui" %}mandatory{% endif %}' +version: '1.1' diff --git a/tests/dictionaries_old/10load_mandatoryifnotin_noexist/result/rougail/00-base.yml b/tests/dictionaries_old/10load_mandatoryifnotin_noexist/result/rougail/00-base.yml index bc2d98d6c..86616f679 100644 --- a/tests/dictionaries_old/10load_mandatoryifnotin_noexist/result/rougail/00-base.yml +++ b/tests/dictionaries_old/10load_mandatoryifnotin_noexist/result/rougail/00-base.yml @@ -15,7 +15,7 @@ general: mandatory: type: jinja jinja: '{% if rougail.general.condition == "oui" or rougail.general.condition - == "non" %}false{% else %}true{% endif %}' + == "non" %}{% else %}mandatory{% endif %}' mode_conteneur_actif2: type: string description: No change @@ -24,5 +24,5 @@ general: mandatory: type: jinja jinja: '{% if rougail.general.condition == "oui" or rougail.general.condition - == "non" %}false{% else %}true{% endif %}' -version: '1.0' + == "non" %}{% else %}mandatory{% endif %}' +version: '1.1' diff --git a/tests/dictionaries_old/10load_multivalue/result/rougail/00-base.yml b/tests/dictionaries_old/10load_multivalue/result/rougail/00-base.yml index 641ad2f39..caf2ccf23 100644 --- a/tests/dictionaries_old/10load_multivalue/result/rougail/00-base.yml +++ b/tests/dictionaries_old/10load_multivalue/result/rougail/00-base.yml @@ -7,4 +7,4 @@ general: default: - non - oui -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/10valid_enum_accent/result/rougail/00-base.yml b/tests/dictionaries_old/10valid_enum_accent/result/rougail/00-base.yml index 7f735c082..6af4d94bd 100644 --- a/tests/dictionaries_old/10valid_enum_accent/result/rougail/00-base.yml +++ b/tests/dictionaries_old/10valid_enum_accent/result/rougail/00-base.yml @@ -16,4 +16,4 @@ enumfam: - b - c - é -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/10valid_enum_append/result/rougail/00-base.yml b/tests/dictionaries_old/10valid_enum_append/result/rougail/00-base.yml index a580a0cd7..392dcd930 100644 --- a/tests/dictionaries_old/10valid_enum_append/result/rougail/00-base.yml +++ b/tests/dictionaries_old/10valid_enum_append/result/rougail/00-base.yml @@ -14,4 +14,4 @@ enumfam: choices: - a - b -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/10valid_enum_append/result/rougail/01-base.yml b/tests/dictionaries_old/10valid_enum_append/result/rougail/01-base.yml index fd5f280ac..f08dd017e 100644 --- a/tests/dictionaries_old/10valid_enum_append/result/rougail/01-base.yml +++ b/tests/dictionaries_old/10valid_enum_append/result/rougail/01-base.yml @@ -4,4 +4,4 @@ enumfam: default: c choices: - c -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/10valid_enum_base/result/rougail/00-base.yml b/tests/dictionaries_old/10valid_enum_base/result/rougail/00-base.yml index 1883430a3..5c5fb35cd 100644 --- a/tests/dictionaries_old/10valid_enum_base/result/rougail/00-base.yml +++ b/tests/dictionaries_old/10valid_enum_base/result/rougail/00-base.yml @@ -15,4 +15,4 @@ enumfam: - a - b - c -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/10valid_enum_base_no_mandatory/result/rougail/00-base.yml b/tests/dictionaries_old/10valid_enum_base_no_mandatory/result/rougail/00-base.yml index 081af1081..a33a4027d 100644 --- a/tests/dictionaries_old/10valid_enum_base_no_mandatory/result/rougail/00-base.yml +++ b/tests/dictionaries_old/10valid_enum_base_no_mandatory/result/rougail/00-base.yml @@ -14,4 +14,4 @@ enumfam: - a - b - c -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/10valid_enum_base_redefine/result/rougail/00-base.yml b/tests/dictionaries_old/10valid_enum_base_redefine/result/rougail/00-base.yml index 6f631b5b7..a28eb31b9 100644 --- a/tests/dictionaries_old/10valid_enum_base_redefine/result/rougail/00-base.yml +++ b/tests/dictionaries_old/10valid_enum_base_redefine/result/rougail/00-base.yml @@ -23,4 +23,4 @@ enumfam: - a - b - c -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/10valid_enum_base_redefine/result/rougail/01-base.yml b/tests/dictionaries_old/10valid_enum_base_redefine/result/rougail/01-base.yml index 92a14cf34..03de01a61 100644 --- a/tests/dictionaries_old/10valid_enum_base_redefine/result/rougail/01-base.yml +++ b/tests/dictionaries_old/10valid_enum_base_redefine/result/rougail/01-base.yml @@ -6,4 +6,4 @@ enumfam: choices: - a - c -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/10valid_enum_leader/result/rougail/00-base.yml b/tests/dictionaries_old/10valid_enum_leader/result/rougail/00-base.yml index 770df6010..074b10951 100644 --- a/tests/dictionaries_old/10valid_enum_leader/result/rougail/00-base.yml +++ b/tests/dictionaries_old/10valid_enum_leader/result/rougail/00-base.yml @@ -23,4 +23,4 @@ general: type: string description: follower2 mandatory: false -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/10valid_enum_mandatory/result/rougail/00-base.yml b/tests/dictionaries_old/10valid_enum_mandatory/result/rougail/00-base.yml index 1557bcbad..df8abe0db 100644 --- a/tests/dictionaries_old/10valid_enum_mandatory/result/rougail/00-base.yml +++ b/tests/dictionaries_old/10valid_enum_mandatory/result/rougail/00-base.yml @@ -15,4 +15,4 @@ enumfam: - a - b - c -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/10valid_enum_multi/result/rougail/00-base.yml b/tests/dictionaries_old/10valid_enum_multi/result/rougail/00-base.yml index ffe6bce4c..836e9fe7c 100644 --- a/tests/dictionaries_old/10valid_enum_multi/result/rougail/00-base.yml +++ b/tests/dictionaries_old/10valid_enum_multi/result/rougail/00-base.yml @@ -13,4 +13,4 @@ general: - a - b - c -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/10valid_enum_none/result/rougail/00-base.yml b/tests/dictionaries_old/10valid_enum_none/result/rougail/00-base.yml index 339e6a916..d689937f8 100644 --- a/tests/dictionaries_old/10valid_enum_none/result/rougail/00-base.yml +++ b/tests/dictionaries_old/10valid_enum_none/result/rougail/00-base.yml @@ -16,4 +16,4 @@ enumfam: - a - b - null -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/10valid_enum_number/result/rougail/00-base.yml b/tests/dictionaries_old/10valid_enum_number/result/rougail/00-base.yml index 5097c4c29..2a7864be6 100644 --- a/tests/dictionaries_old/10valid_enum_number/result/rougail/00-base.yml +++ b/tests/dictionaries_old/10valid_enum_number/result/rougail/00-base.yml @@ -15,4 +15,4 @@ enumfam: - 1 - 2 - 3 -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/10valid_enum_numberdefault/result/rougail/00-base.yml b/tests/dictionaries_old/10valid_enum_numberdefault/result/rougail/00-base.yml index 4d2e44c0e..3148c4093 100644 --- a/tests/dictionaries_old/10valid_enum_numberdefault/result/rougail/00-base.yml +++ b/tests/dictionaries_old/10valid_enum_numberdefault/result/rougail/00-base.yml @@ -15,4 +15,4 @@ enumfam: - 1 - 2 - 3 -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/10valid_enum_param_empty/result/rougail/00-base.yml b/tests/dictionaries_old/10valid_enum_param_empty/result/rougail/00-base.yml index 12c0e5427..ef267e9b1 100644 --- a/tests/dictionaries_old/10valid_enum_param_empty/result/rougail/00-base.yml +++ b/tests/dictionaries_old/10valid_enum_param_empty/result/rougail/00-base.yml @@ -7,4 +7,4 @@ enumfam: default: null choices: - null -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/10valid_enum_param_empty2/result/rougail/00-base.yml b/tests/dictionaries_old/10valid_enum_param_empty2/result/rougail/00-base.yml index e54ebc35b..bf82dee54 100644 --- a/tests/dictionaries_old/10valid_enum_param_empty2/result/rougail/00-base.yml +++ b/tests/dictionaries_old/10valid_enum_param_empty2/result/rougail/00-base.yml @@ -13,4 +13,4 @@ enumfam: default: null choices: - null -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/10valid_enum_quote/result/rougail/00-base.yml b/tests/dictionaries_old/10valid_enum_quote/result/rougail/00-base.yml index 1f0fa5c0f..aa000e50d 100644 --- a/tests/dictionaries_old/10valid_enum_quote/result/rougail/00-base.yml +++ b/tests/dictionaries_old/10valid_enum_quote/result/rougail/00-base.yml @@ -15,4 +15,4 @@ enumfam: - quote' - quote" - quote"' -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/10valid_enum_value/result/rougail/00-base.yml b/tests/dictionaries_old/10valid_enum_value/result/rougail/00-base.yml index 838e7f785..cb50bac36 100644 --- a/tests/dictionaries_old/10valid_enum_value/result/rougail/00-base.yml +++ b/tests/dictionaries_old/10valid_enum_value/result/rougail/00-base.yml @@ -7,4 +7,4 @@ general: - a - b - c -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/11disabled_if_in_filelist/result/rougail/00-base.yml b/tests/dictionaries_old/11disabled_if_in_filelist/result/rougail/00-base.yml index ccb368d8b..b7bcc817d 100644 --- a/tests/dictionaries_old/11disabled_if_in_filelist/result/rougail/00-base.yml +++ b/tests/dictionaries_old/11disabled_if_in_filelist/result/rougail/00-base.yml @@ -9,13 +9,11 @@ general: default: non disabled: type: jinja - jinja: '{% if rougail.general.condition == "oui" %}true{% else %}false{% endif - %}' + jinja: '{% if rougail.general.condition == "oui" %}disabled{% endif %}' mode_conteneur_actif2: type: boolean description: No change disabled: type: jinja - jinja: '{% if rougail.general.condition == "oui" %}true{% else %}false{% endif - %}' -version: '1.0' + jinja: '{% if rougail.general.condition == "oui" %}disabled{% endif %}' +version: '1.1' diff --git a/tests/dictionaries_old/11disabled_if_in_filelist/result/services/00-base.yml b/tests/dictionaries_old/11disabled_if_in_filelist/result/services/00-base.yml index 91273e771..0981730b1 100644 --- a/tests/dictionaries_old/11disabled_if_in_filelist/result/services/00-base.yml +++ b/tests/dictionaries_old/11disabled_if_in_filelist/result/services/00-base.yml @@ -3,6 +3,5 @@ test.service: /etc/file: disabled: type: jinja - jinja: '{% if rougail.general.condition == "oui" %}true{% else %}false{% endif - %}' -version: '1.0' + jinja: '{% if rougail.general.condition == "oui" %}disabled{% endif %}' +version: '1.1' diff --git a/tests/dictionaries_old/11disabled_if_in_filelist_boolean/result/rougail/00-base.yml b/tests/dictionaries_old/11disabled_if_in_filelist_boolean/result/rougail/00-base.yml index 9b10c48f8..03ff18ec8 100644 --- a/tests/dictionaries_old/11disabled_if_in_filelist_boolean/result/rougail/00-base.yml +++ b/tests/dictionaries_old/11disabled_if_in_filelist_boolean/result/rougail/00-base.yml @@ -1,4 +1,4 @@ general: condition: type: boolean -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/11disabled_if_in_filelist_boolean/result/services/00-base.yml b/tests/dictionaries_old/11disabled_if_in_filelist_boolean/result/services/00-base.yml index 8d43ab1c1..593a50256 100644 --- a/tests/dictionaries_old/11disabled_if_in_filelist_boolean/result/services/00-base.yml +++ b/tests/dictionaries_old/11disabled_if_in_filelist_boolean/result/services/00-base.yml @@ -3,6 +3,5 @@ test.service: /tmp/file1: disabled: type: jinja - jinja: '{% if rougail.general.condition == true %}true{% else %}false{% endif - %}' -version: '1.0' + jinja: '{% if rougail.general.condition == true %}disabled{% endif %}' +version: '1.1' diff --git a/tests/dictionaries_old/11disabled_if_in_filelist_boolean2/result/rougail/00-base.yml b/tests/dictionaries_old/11disabled_if_in_filelist_boolean2/result/rougail/00-base.yml index c0abf7583..ee584da37 100644 --- a/tests/dictionaries_old/11disabled_if_in_filelist_boolean2/result/rougail/00-base.yml +++ b/tests/dictionaries_old/11disabled_if_in_filelist_boolean2/result/rougail/00-base.yml @@ -2,4 +2,4 @@ general: condition: type: boolean default: false -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/11disabled_if_in_filelist_boolean2/result/services/00-base.yml b/tests/dictionaries_old/11disabled_if_in_filelist_boolean2/result/services/00-base.yml index 8d43ab1c1..593a50256 100644 --- a/tests/dictionaries_old/11disabled_if_in_filelist_boolean2/result/services/00-base.yml +++ b/tests/dictionaries_old/11disabled_if_in_filelist_boolean2/result/services/00-base.yml @@ -3,6 +3,5 @@ test.service: /tmp/file1: disabled: type: jinja - jinja: '{% if rougail.general.condition == true %}true{% else %}false{% endif - %}' -version: '1.0' + jinja: '{% if rougail.general.condition == true %}disabled{% endif %}' +version: '1.1' diff --git a/tests/dictionaries_old/11disabled_if_in_filelist_disabled/result/rougail/00-base.yml b/tests/dictionaries_old/11disabled_if_in_filelist_disabled/result/rougail/00-base.yml index db70b3ed2..778391dde 100644 --- a/tests/dictionaries_old/11disabled_if_in_filelist_disabled/result/rougail/00-base.yml +++ b/tests/dictionaries_old/11disabled_if_in_filelist_disabled/result/rougail/00-base.yml @@ -9,14 +9,12 @@ general: default: non disabled: type: jinja - jinja: '{% if rougail.general.condition == "oui" %}true{% else %}false{% endif - %}' + jinja: '{% if rougail.general.condition == "oui" %}disabled{% endif %}' mode_conteneur_actif2: type: string description: No change default: non disabled: type: jinja - jinja: '{% if rougail.general.condition == "oui" %}true{% else %}false{% endif - %}' -version: '1.0' + jinja: '{% if rougail.general.condition == "oui" %}disabled{% endif %}' +version: '1.1' diff --git a/tests/dictionaries_old/11disabled_if_in_filelist_disabled/result/services/00-base.yml b/tests/dictionaries_old/11disabled_if_in_filelist_disabled/result/services/00-base.yml index 91273e771..0981730b1 100644 --- a/tests/dictionaries_old/11disabled_if_in_filelist_disabled/result/services/00-base.yml +++ b/tests/dictionaries_old/11disabled_if_in_filelist_disabled/result/services/00-base.yml @@ -3,6 +3,5 @@ test.service: /etc/file: disabled: type: jinja - jinja: '{% if rougail.general.condition == "oui" %}true{% else %}false{% endif - %}' -version: '1.0' + jinja: '{% if rougail.general.condition == "oui" %}disabled{% endif %}' +version: '1.1' diff --git a/tests/dictionaries_old/11disabled_if_in_filelist_multi/result/rougail/00-base.yml b/tests/dictionaries_old/11disabled_if_in_filelist_multi/result/rougail/00-base.yml index 57453550e..fb681e03f 100644 --- a/tests/dictionaries_old/11disabled_if_in_filelist_multi/result/rougail/00-base.yml +++ b/tests/dictionaries_old/11disabled_if_in_filelist_multi/result/rougail/00-base.yml @@ -9,14 +9,12 @@ general: default: non disabled: type: jinja - jinja: '{% if rougail.general.condition == "oui" %}true{% else %}false{% endif - %}' + jinja: '{% if rougail.general.condition == "oui" %}disabled{% endif %}' mode_conteneur_actif2: type: string description: No change default: non disabled: type: jinja - jinja: '{% if rougail.general.condition == "oui" %}true{% else %}false{% endif - %}' -version: '1.0' + jinja: '{% if rougail.general.condition == "oui" %}disabled{% endif %}' +version: '1.1' diff --git a/tests/dictionaries_old/11disabled_if_in_filelist_multi/result/services/00-base.yml b/tests/dictionaries_old/11disabled_if_in_filelist_multi/result/services/00-base.yml index ebf2d5a93..d5e8b167b 100644 --- a/tests/dictionaries_old/11disabled_if_in_filelist_multi/result/services/00-base.yml +++ b/tests/dictionaries_old/11disabled_if_in_filelist_multi/result/services/00-base.yml @@ -3,11 +3,9 @@ test.service: /tmp/file1: disabled: type: jinja - jinja: '{% if rougail.general.condition == "oui" %}true{% else %}false{% endif - %}' + jinja: '{% if rougail.general.condition == "oui" %}disabled{% endif %}' /tmp/file2: disabled: type: jinja - jinja: '{% if rougail.general.condition == "oui" %}true{% else %}false{% endif - %}' -version: '1.0' + jinja: '{% if rougail.general.condition == "oui" %}disabled{% endif %}' +version: '1.1' diff --git a/tests/dictionaries_old/11disabled_if_in_filelist_same_name/result/rougail/00-base.yml b/tests/dictionaries_old/11disabled_if_in_filelist_same_name/result/rougail/00-base.yml index ccb368d8b..b7bcc817d 100644 --- a/tests/dictionaries_old/11disabled_if_in_filelist_same_name/result/rougail/00-base.yml +++ b/tests/dictionaries_old/11disabled_if_in_filelist_same_name/result/rougail/00-base.yml @@ -9,13 +9,11 @@ general: default: non disabled: type: jinja - jinja: '{% if rougail.general.condition == "oui" %}true{% else %}false{% endif - %}' + jinja: '{% if rougail.general.condition == "oui" %}disabled{% endif %}' mode_conteneur_actif2: type: boolean description: No change disabled: type: jinja - jinja: '{% if rougail.general.condition == "oui" %}true{% else %}false{% endif - %}' -version: '1.0' + jinja: '{% if rougail.general.condition == "oui" %}disabled{% endif %}' +version: '1.1' diff --git a/tests/dictionaries_old/11disabled_if_in_filelist_same_name/result/services/00-base.yml b/tests/dictionaries_old/11disabled_if_in_filelist_same_name/result/services/00-base.yml index 91273e771..0981730b1 100644 --- a/tests/dictionaries_old/11disabled_if_in_filelist_same_name/result/services/00-base.yml +++ b/tests/dictionaries_old/11disabled_if_in_filelist_same_name/result/services/00-base.yml @@ -3,6 +3,5 @@ test.service: /etc/file: disabled: type: jinja - jinja: '{% if rougail.general.condition == "oui" %}true{% else %}false{% endif - %}' -version: '1.0' + jinja: '{% if rougail.general.condition == "oui" %}disabled{% endif %}' +version: '1.1' diff --git a/tests/dictionaries_old/11disabledifin_filelist_notexist/result/rougail/00-base.yml b/tests/dictionaries_old/11disabledifin_filelist_notexist/result/rougail/00-base.yml index 0702f5f71..08c43bb38 100644 --- a/tests/dictionaries_old/11disabledifin_filelist_notexist/result/rougail/00-base.yml +++ b/tests/dictionaries_old/11disabledifin_filelist_notexist/result/rougail/00-base.yml @@ -13,4 +13,4 @@ general: description: No change hidden: true default: non -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/11disabledifin_filelist_notexist/result/services/00-base.yml b/tests/dictionaries_old/11disabledifin_filelist_notexist/result/services/00-base.yml index 9209d7615..33fda7fcf 100644 --- a/tests/dictionaries_old/11disabledifin_filelist_notexist/result/services/00-base.yml +++ b/tests/dictionaries_old/11disabledifin_filelist_notexist/result/services/00-base.yml @@ -3,6 +3,6 @@ test.service: /tmp/file: disabled: type: jinja - jinja: '{% if rougail.general.condition == "unpossible" %}false{% else %}true{% + jinja: '{% if rougail.general.condition == "unpossible" %}{% else %}disabled{% endif %}' -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/11disabledifnotin_filelist_notexist/result/rougail/00-base.yml b/tests/dictionaries_old/11disabledifnotin_filelist_notexist/result/rougail/00-base.yml index 0702f5f71..08c43bb38 100644 --- a/tests/dictionaries_old/11disabledifnotin_filelist_notexist/result/rougail/00-base.yml +++ b/tests/dictionaries_old/11disabledifnotin_filelist_notexist/result/rougail/00-base.yml @@ -13,4 +13,4 @@ general: description: No change hidden: true default: non -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/11disabledifnotin_filelist_notexist/result/services/00-base.yml b/tests/dictionaries_old/11disabledifnotin_filelist_notexist/result/services/00-base.yml index 9209d7615..33fda7fcf 100644 --- a/tests/dictionaries_old/11disabledifnotin_filelist_notexist/result/services/00-base.yml +++ b/tests/dictionaries_old/11disabledifnotin_filelist_notexist/result/services/00-base.yml @@ -3,6 +3,6 @@ test.service: /tmp/file: disabled: type: jinja - jinja: '{% if rougail.general.condition == "unpossible" %}false{% else %}true{% + jinja: '{% if rougail.general.condition == "unpossible" %}{% else %}disabled{% endif %}' -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/11disabledifnotin_filelist_notexist_multi/result/rougail/00-base.yml b/tests/dictionaries_old/11disabledifnotin_filelist_notexist_multi/result/rougail/00-base.yml index 0702f5f71..08c43bb38 100644 --- a/tests/dictionaries_old/11disabledifnotin_filelist_notexist_multi/result/rougail/00-base.yml +++ b/tests/dictionaries_old/11disabledifnotin_filelist_notexist_multi/result/rougail/00-base.yml @@ -13,4 +13,4 @@ general: description: No change hidden: true default: non -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/11disabledifnotin_filelist_notexist_multi/result/services/00-base.yml b/tests/dictionaries_old/11disabledifnotin_filelist_notexist_multi/result/services/00-base.yml index 9209d7615..33fda7fcf 100644 --- a/tests/dictionaries_old/11disabledifnotin_filelist_notexist_multi/result/services/00-base.yml +++ b/tests/dictionaries_old/11disabledifnotin_filelist_notexist_multi/result/services/00-base.yml @@ -3,6 +3,6 @@ test.service: /tmp/file: disabled: type: jinja - jinja: '{% if rougail.general.condition == "unpossible" %}false{% else %}true{% + jinja: '{% if rougail.general.condition == "unpossible" %}{% else %}disabled{% endif %}' -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/11disabledifnotin_filelist_notexist_validenum/result/rougail/00-base.yml b/tests/dictionaries_old/11disabledifnotin_filelist_notexist_validenum/result/rougail/00-base.yml index d4635ae31..94380ef7a 100644 --- a/tests/dictionaries_old/11disabledifnotin_filelist_notexist_validenum/result/rougail/00-base.yml +++ b/tests/dictionaries_old/11disabledifnotin_filelist_notexist_validenum/result/rougail/00-base.yml @@ -16,4 +16,4 @@ general: description: No change hidden: true default: non -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/11disabledifnotin_filelist_notexist_validenum/result/services/00-base.yml b/tests/dictionaries_old/11disabledifnotin_filelist_notexist_validenum/result/services/00-base.yml index 30155012f..06cee9eff 100644 --- a/tests/dictionaries_old/11disabledifnotin_filelist_notexist_validenum/result/services/00-base.yml +++ b/tests/dictionaries_old/11disabledifnotin_filelist_notexist_validenum/result/services/00-base.yml @@ -3,6 +3,6 @@ test.service: /tmp/file: disabled: type: jinja - jinja: '{% if rougail.general.condition == "statique" %}false{% else %}true{% + jinja: '{% if rougail.general.condition == "statique" %}{% else %}disabled{% endif %}' -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/11multi_disabled_if_in_filelist/result/rougail/00-base.yml b/tests/dictionaries_old/11multi_disabled_if_in_filelist/result/rougail/00-base.yml index b7524fed1..efaa95b83 100644 --- a/tests/dictionaries_old/11multi_disabled_if_in_filelist/result/rougail/00-base.yml +++ b/tests/dictionaries_old/11multi_disabled_if_in_filelist/result/rougail/00-base.yml @@ -8,4 +8,4 @@ general: type: string description: No change default: non -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/11multi_disabled_if_in_filelist/result/services/00-base.yml b/tests/dictionaries_old/11multi_disabled_if_in_filelist/result/services/00-base.yml index cef7b6d98..3ef03ffbf 100644 --- a/tests/dictionaries_old/11multi_disabled_if_in_filelist/result/services/00-base.yml +++ b/tests/dictionaries_old/11multi_disabled_if_in_filelist/result/services/00-base.yml @@ -3,5 +3,5 @@ test.service: /tmp/file1: disabled: type: jinja - jinja: '{% if __activer_clam == "non" %}true{% else %}false{% endif %}' -version: '1.0' + jinja: '{% if __activer_clam == "non" %}disabled{% endif %}' +version: '1.1' diff --git a/tests/dictionaries_old/11valid_enum_function/result/rougail/00-base.yml b/tests/dictionaries_old/11valid_enum_function/result/rougail/00-base.yml index 656fcdd61..fbc2bc952 100644 --- a/tests/dictionaries_old/11valid_enum_function/result/rougail/00-base.yml +++ b/tests/dictionaries_old/11valid_enum_function/result/rougail/00-base.yml @@ -6,4 +6,4 @@ general: choices: - type: jinja jinja: '{{ 0 | trange(10) }}' -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/11valid_enum_variable/result/rougail/00-base.yml b/tests/dictionaries_old/11valid_enum_variable/result/rougail/00-base.yml index ab1accacb..0625674b1 100644 --- a/tests/dictionaries_old/11valid_enum_variable/result/rougail/00-base.yml +++ b/tests/dictionaries_old/11valid_enum_variable/result/rougail/00-base.yml @@ -14,4 +14,4 @@ general: - a - b - c -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/20family_append/result/rougail/00-base.yml b/tests/dictionaries_old/20family_append/result/rougail/00-base.yml index 765ba2c20..3f5e4a739 100644 --- a/tests/dictionaries_old/20family_append/result/rougail/00-base.yml +++ b/tests/dictionaries_old/20family_append/result/rougail/00-base.yml @@ -4,4 +4,4 @@ general: description: No change hidden: true default: non -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/20family_append/result/rougail/01-base.yml b/tests/dictionaries_old/20family_append/result/rougail/01-base.yml index 6819701d7..b50350d01 100644 --- a/tests/dictionaries_old/20family_append/result/rougail/01-base.yml +++ b/tests/dictionaries_old/20family_append/result/rougail/01-base.yml @@ -4,4 +4,4 @@ general: description: No change hidden: true default: non -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/20family_disabled/result/rougail/00-base.yml b/tests/dictionaries_old/20family_disabled/result/rougail/00-base.yml index 522bc25aa..15dc657a7 100644 --- a/tests/dictionaries_old/20family_disabled/result/rougail/00-base.yml +++ b/tests/dictionaries_old/20family_disabled/result/rougail/00-base.yml @@ -5,4 +5,4 @@ general: description: No change disabled: true default: non -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/20family_dynamic/result/rougail/00-base.yml b/tests/dictionaries_old/20family_dynamic/result/rougail/00-base.yml index dc718dd89..7454465d1 100644 --- a/tests/dictionaries_old/20family_dynamic/result/rougail/00-base.yml +++ b/tests/dictionaries_old/20family_dynamic/result/rougail/00-base.yml @@ -8,9 +8,12 @@ general: - val2 dyn: type: dynamic - variable: rougail.general.varname vardyn: type: string description: No change mandatory: false -version: '1.0' + dynamic: + type: variable + variable: rougail.general.varname + propertyerror: false +version: '1.1' diff --git a/tests/dictionaries_old/20family_dynamic_calc/result/rougail/00-base.yml b/tests/dictionaries_old/20family_dynamic_calc/result/rougail/00-base.yml index 01fc6309f..a72e68395 100644 --- a/tests/dictionaries_old/20family_dynamic_calc/result/rougail/00-base.yml +++ b/tests/dictionaries_old/20family_dynamic_calc/result/rougail/00-base.yml @@ -8,11 +8,14 @@ general: - val2 dyn: type: dynamic - variable: rougail.general.varname vardyn: type: string description: No change default: val + dynamic: + type: variable + variable: rougail.general.varname + propertyerror: false new: newvar: type: string @@ -21,4 +24,4 @@ new: default: type: jinja jinja: '{{ __vardynval1 | calc_val }}' -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/20family_dynamic_calc2/result/rougail/00-base.yml b/tests/dictionaries_old/20family_dynamic_calc2/result/rougail/00-base.yml index d16ddb867..d7d96a383 100644 --- a/tests/dictionaries_old/20family_dynamic_calc2/result/rougail/00-base.yml +++ b/tests/dictionaries_old/20family_dynamic_calc2/result/rougail/00-base.yml @@ -8,17 +8,20 @@ general: - val2 dyn: type: dynamic - variable: rougail.general.varname vardyn: type: string description: No change default: val hidden: type: jinja - jinja: '{% if rougail.new.newvar == "non" %}true{% else %}false{% endif %}' + jinja: '{% if rougail.new.newvar == "non" %}hidden{% endif %}' + dynamic: + type: variable + variable: rougail.general.varname + propertyerror: false new: newvar: type: string description: No change mandatory: false -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/20family_dynamic_calc_suffix/result/rougail/00-base.yml b/tests/dictionaries_old/20family_dynamic_calc_suffix/result/rougail/00-base.yml index cf1f2a204..bd119fa40 100644 --- a/tests/dictionaries_old/20family_dynamic_calc_suffix/result/rougail/00-base.yml +++ b/tests/dictionaries_old/20family_dynamic_calc_suffix/result/rougail/00-base.yml @@ -8,7 +8,6 @@ general: - val2 dyn: type: dynamic - variable: rougail.general.varname vardyn: type: string description: No change @@ -18,9 +17,13 @@ dyn: params: __suffix: type: suffix + dynamic: + type: variable + variable: rougail.general.varname + propertyerror: false new: newvar: type: string description: No change mandatory: false -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/20family_dynamic_description/result/rougail/00-base.yml b/tests/dictionaries_old/20family_dynamic_description/result/rougail/00-base.yml index b4cb56036..a304a4f61 100644 --- a/tests/dictionaries_old/20family_dynamic_description/result/rougail/00-base.yml +++ b/tests/dictionaries_old/20family_dynamic_description/result/rougail/00-base.yml @@ -9,9 +9,12 @@ general: dyn: description: 'Dyn ' type: dynamic - variable: rougail.general.varname vardyn: type: string description: No change mandatory: false -version: '1.0' + dynamic: + type: variable + variable: rougail.general.varname + propertyerror: false +version: '1.1' diff --git a/tests/dictionaries_old/20family_dynamic_jinja_fill/result/rougail/00-base.yml b/tests/dictionaries_old/20family_dynamic_jinja_fill/result/rougail/00-base.yml index 8b72b371d..fd0cc9558 100644 --- a/tests/dictionaries_old/20family_dynamic_jinja_fill/result/rougail/00-base.yml +++ b/tests/dictionaries_old/20family_dynamic_jinja_fill/result/rougail/00-base.yml @@ -8,11 +8,14 @@ general: - val2 dyn: type: dynamic - variable: rougail.general.varname vardyn: type: string description: No change default: val + dynamic: + type: variable + variable: rougail.general.varname + propertyerror: false new: newvar: type: string @@ -21,4 +24,4 @@ new: default: type: jinja jinja: '{{ vardynval1 }}' -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/20family_dynamic_leadership/result/rougail/00-base.yml b/tests/dictionaries_old/20family_dynamic_leadership/result/rougail/00-base.yml index 976e19863..0a9873471 100644 --- a/tests/dictionaries_old/20family_dynamic_leadership/result/rougail/00-base.yml +++ b/tests/dictionaries_old/20family_dynamic_leadership/result/rougail/00-base.yml @@ -8,7 +8,6 @@ general: - val2 dyn: type: dynamic - variable: rougail.general.varname vardyn: type: string description: No change @@ -28,4 +27,8 @@ dyn: type: string description: follower2 mandatory: false -version: '1.0' + dynamic: + type: variable + variable: rougail.general.varname + propertyerror: false +version: '1.1' diff --git a/tests/dictionaries_old/20family_dynamic_number/result/rougail/00-base.yml b/tests/dictionaries_old/20family_dynamic_number/result/rougail/00-base.yml index 50a0c38f6..ba614626b 100644 --- a/tests/dictionaries_old/20family_dynamic_number/result/rougail/00-base.yml +++ b/tests/dictionaries_old/20family_dynamic_number/result/rougail/00-base.yml @@ -8,11 +8,14 @@ general: - 2 dyn: type: dynamic - variable: rougail.general.varname vardyn: type: string description: No change default: val + dynamic: + type: variable + variable: rougail.general.varname + propertyerror: false new: newvar: type: string @@ -21,4 +24,4 @@ new: default: type: jinja jinja: '{{ __vardyn1 | calc_val }}' -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/20family_empty/result/rougail/00-base.yml b/tests/dictionaries_old/20family_empty/result/rougail/00-base.yml index 167d71a55..8fc693cc7 100644 --- a/tests/dictionaries_old/20family_empty/result/rougail/00-base.yml +++ b/tests/dictionaries_old/20family_empty/result/rougail/00-base.yml @@ -6,4 +6,4 @@ general: default: non general2: help: family -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/20family_hidden/result/rougail/00-base.yml b/tests/dictionaries_old/20family_hidden/result/rougail/00-base.yml index 765ba2c20..3f5e4a739 100644 --- a/tests/dictionaries_old/20family_hidden/result/rougail/00-base.yml +++ b/tests/dictionaries_old/20family_hidden/result/rougail/00-base.yml @@ -4,4 +4,4 @@ general: description: No change hidden: true default: non -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/20family_hidden/result/rougail/01-base.yml b/tests/dictionaries_old/20family_hidden/result/rougail/01-base.yml index 89f4ffc45..b6cdabd56 100644 --- a/tests/dictionaries_old/20family_hidden/result/rougail/01-base.yml +++ b/tests/dictionaries_old/20family_hidden/result/rougail/01-base.yml @@ -1,4 +1,4 @@ general: hidden: true redefine: true -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/20family_mode/result/rougail/00-base.yml b/tests/dictionaries_old/20family_mode/result/rougail/00-base.yml index 71f7adc02..14809ccef 100644 --- a/tests/dictionaries_old/20family_mode/result/rougail/00-base.yml +++ b/tests/dictionaries_old/20family_mode/result/rougail/00-base.yml @@ -4,4 +4,4 @@ general: description: No change mode: basic default: non -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/20family_modeleadership/result/rougail/00-base.yml b/tests/dictionaries_old/20family_modeleadership/result/rougail/00-base.yml index 22eb57b32..b72dc28ef 100644 --- a/tests/dictionaries_old/20family_modeleadership/result/rougail/00-base.yml +++ b/tests/dictionaries_old/20family_modeleadership/result/rougail/00-base.yml @@ -20,4 +20,4 @@ general: description: follower2 mode: basic mandatory: false -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/20notemplating/result/rougail/00-base.yml b/tests/dictionaries_old/20notemplating/result/rougail/00-base.yml index 6522280e9..96887c594 100644 --- a/tests/dictionaries_old/20notemplating/result/rougail/00-base.yml +++ b/tests/dictionaries_old/20notemplating/result/rougail/00-base.yml @@ -3,4 +3,4 @@ general: type: string description: No change default: non -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/20notemplating/result/services/00-base.yml b/tests/dictionaries_old/20notemplating/result/services/00-base.yml index 0b76d6d97..09bed7e83 100644 --- a/tests/dictionaries_old/20notemplating/result/services/00-base.yml +++ b/tests/dictionaries_old/20notemplating/result/services/00-base.yml @@ -2,4 +2,4 @@ test.service: files: /etc/file: engine: none -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/20override/result/rougail/00-base.yml b/tests/dictionaries_old/20override/result/rougail/00-base.yml index 6522280e9..96887c594 100644 --- a/tests/dictionaries_old/20override/result/rougail/00-base.yml +++ b/tests/dictionaries_old/20override/result/rougail/00-base.yml @@ -3,4 +3,4 @@ general: type: string description: No change default: non -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/20override/result/services/00-base.yml b/tests/dictionaries_old/20override/result/services/00-base.yml index b22418e0b..57a345144 100644 --- a/tests/dictionaries_old/20override/result/services/00-base.yml +++ b/tests/dictionaries_old/20override/result/services/00-base.yml @@ -3,4 +3,4 @@ test.service: test2.service: override: engine: jinja -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/20override_no_templating/result/rougail/00-base.yml b/tests/dictionaries_old/20override_no_templating/result/rougail/00-base.yml index 6522280e9..96887c594 100644 --- a/tests/dictionaries_old/20override_no_templating/result/rougail/00-base.yml +++ b/tests/dictionaries_old/20override_no_templating/result/rougail/00-base.yml @@ -3,4 +3,4 @@ general: type: string description: No change default: non -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/20override_no_templating/result/services/00-base.yml b/tests/dictionaries_old/20override_no_templating/result/services/00-base.yml index d55f83ddb..416a016a4 100644 --- a/tests/dictionaries_old/20override_no_templating/result/services/00-base.yml +++ b/tests/dictionaries_old/20override_no_templating/result/services/00-base.yml @@ -1,4 +1,4 @@ test.service: override: engine: none -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/20override_source/result/rougail/00-base.yml b/tests/dictionaries_old/20override_source/result/rougail/00-base.yml index 6522280e9..96887c594 100644 --- a/tests/dictionaries_old/20override_source/result/rougail/00-base.yml +++ b/tests/dictionaries_old/20override_source/result/rougail/00-base.yml @@ -3,4 +3,4 @@ general: type: string description: No change default: non -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/20override_source/result/services/00-base.yml b/tests/dictionaries_old/20override_source/result/services/00-base.yml index b199c5321..a5808168e 100644 --- a/tests/dictionaries_old/20override_source/result/services/00-base.yml +++ b/tests/dictionaries_old/20override_source/result/services/00-base.yml @@ -1,4 +1,4 @@ test.service: override: source: test2.service -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/21family_empty/result/rougail/00-base.yml b/tests/dictionaries_old/21family_empty/result/rougail/00-base.yml index cc32e34b9..51b265397 100644 --- a/tests/dictionaries_old/21family_empty/result/rougail/00-base.yml +++ b/tests/dictionaries_old/21family_empty/result/rougail/00-base.yml @@ -4,4 +4,4 @@ general: description: No change default: non general1: {} -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/21family_empty_sub/result/rougail/00-base.yml b/tests/dictionaries_old/21family_empty_sub/result/rougail/00-base.yml index 60b2b848f..c0cecd478 100644 --- a/tests/dictionaries_old/21family_empty_sub/result/rougail/00-base.yml +++ b/tests/dictionaries_old/21family_empty_sub/result/rougail/00-base.yml @@ -5,4 +5,4 @@ general: default: non general1: general2: {} -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/22provider_dynamic/result/rougail/00-base.yml b/tests/dictionaries_old/22provider_dynamic/result/rougail/00-base.yml index 0c92c46b4..869e6e72a 100644 --- a/tests/dictionaries_old/22provider_dynamic/result/rougail/00-base.yml +++ b/tests/dictionaries_old/22provider_dynamic/result/rougail/00-base.yml @@ -8,10 +8,13 @@ general: - val2 dyn: type: dynamic - variable: rougail.general.varname vardyn: type: string description: No change provider: dyn mandatory: false -version: '1.0' + dynamic: + type: variable + variable: rougail.general.varname + propertyerror: false +version: '1.1' diff --git a/tests/dictionaries_old/22provider_dynamic_2/result/rougail/00-base.yml b/tests/dictionaries_old/22provider_dynamic_2/result/rougail/00-base.yml index 3a524f9ff..a426cb237 100644 --- a/tests/dictionaries_old/22provider_dynamic_2/result/rougail/00-base.yml +++ b/tests/dictionaries_old/22provider_dynamic_2/result/rougail/00-base.yml @@ -8,10 +8,13 @@ varname: general: dyn: type: dynamic - variable: rougail.varname vardyn: type: string description: No change provider: dyn mandatory: false -version: '1.0' + dynamic: + type: variable + variable: rougail.varname + propertyerror: false +version: '1.1' diff --git a/tests/dictionaries_old/30mandatory_withoutvalue/result/rougail/00-base.yml b/tests/dictionaries_old/30mandatory_withoutvalue/result/rougail/00-base.yml index 3390ba5c4..5251c3144 100644 --- a/tests/dictionaries_old/30mandatory_withoutvalue/result/rougail/00-base.yml +++ b/tests/dictionaries_old/30mandatory_withoutvalue/result/rougail/00-base.yml @@ -3,4 +3,4 @@ general: type: string description: No change mandatory: true -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/30mandatory_withoutvaluecalc/result/rougail/00-base.yml b/tests/dictionaries_old/30mandatory_withoutvaluecalc/result/rougail/00-base.yml index ae2a21605..0a2487604 100644 --- a/tests/dictionaries_old/30mandatory_withoutvaluecalc/result/rougail/00-base.yml +++ b/tests/dictionaries_old/30mandatory_withoutvaluecalc/result/rougail/00-base.yml @@ -7,4 +7,4 @@ general: default: type: jinja jinja: '{{ "value" | calc_val }}' -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/30mandatory_withvalue/result/rougail/00-base.yml b/tests/dictionaries_old/30mandatory_withvalue/result/rougail/00-base.yml index 5b7b86f1f..c1501c3c4 100644 --- a/tests/dictionaries_old/30mandatory_withvalue/result/rougail/00-base.yml +++ b/tests/dictionaries_old/30mandatory_withvalue/result/rougail/00-base.yml @@ -3,4 +3,4 @@ general: type: string description: No change default: value -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/30mandatory_withvaluecalc/result/rougail/00-base.yml b/tests/dictionaries_old/30mandatory_withvaluecalc/result/rougail/00-base.yml index 7022b2bb2..ecb194655 100644 --- a/tests/dictionaries_old/30mandatory_withvaluecalc/result/rougail/00-base.yml +++ b/tests/dictionaries_old/30mandatory_withvaluecalc/result/rougail/00-base.yml @@ -6,4 +6,4 @@ general: default: type: jinja jinja: '{{ "value" | calc_val }}' -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/40condition_base/result/rougail/00-base.yml b/tests/dictionaries_old/40condition_base/result/rougail/00-base.yml index 7bb8fc4e3..4219af677 100644 --- a/tests/dictionaries_old/40condition_base/result/rougail/00-base.yml +++ b/tests/dictionaries_old/40condition_base/result/rougail/00-base.yml @@ -13,14 +13,12 @@ general: default: non disabled: type: jinja - jinja: '{% if rougail.general.condition == "oui" %}true{% else %}false{% endif - %}' + jinja: '{% if rougail.general.condition == "oui" %}disabled{% endif %}' mode_conteneur_actif2: type: string description: No change default: non disabled: type: jinja - jinja: '{% if rougail.general.condition == "oui" %}true{% else %}false{% endif - %}' -version: '1.0' + jinja: '{% if rougail.general.condition == "oui" %}disabled{% endif %}' +version: '1.1' diff --git a/tests/dictionaries_old/40condition_base_add/result/rougail/00-base.yml b/tests/dictionaries_old/40condition_base_add/result/rougail/00-base.yml index 7bb8fc4e3..4219af677 100644 --- a/tests/dictionaries_old/40condition_base_add/result/rougail/00-base.yml +++ b/tests/dictionaries_old/40condition_base_add/result/rougail/00-base.yml @@ -13,14 +13,12 @@ general: default: non disabled: type: jinja - jinja: '{% if rougail.general.condition == "oui" %}true{% else %}false{% endif - %}' + jinja: '{% if rougail.general.condition == "oui" %}disabled{% endif %}' mode_conteneur_actif2: type: string description: No change default: non disabled: type: jinja - jinja: '{% if rougail.general.condition == "oui" %}true{% else %}false{% endif - %}' -version: '1.0' + jinja: '{% if rougail.general.condition == "oui" %}disabled{% endif %}' +version: '1.1' diff --git a/tests/dictionaries_old/40condition_base_add/result/rougail/01-base.yml b/tests/dictionaries_old/40condition_base_add/result/rougail/01-base.yml index d80321891..fe288f974 100644 --- a/tests/dictionaries_old/40condition_base_add/result/rougail/01-base.yml +++ b/tests/dictionaries_old/40condition_base_add/result/rougail/01-base.yml @@ -4,4 +4,4 @@ general: hidden: false disabled: false mandatory: false -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/40condition_fallback/result/rougail/00-base.yml b/tests/dictionaries_old/40condition_fallback/result/rougail/00-base.yml index 7bd55dd8d..5add5d038 100644 --- a/tests/dictionaries_old/40condition_fallback/result/rougail/00-base.yml +++ b/tests/dictionaries_old/40condition_fallback/result/rougail/00-base.yml @@ -9,14 +9,14 @@ general: default: non disabled: type: jinja - jinja: '{% if __condition == "oui" %}true{% else %}false{% endif %}' + jinja: '{% if __condition == "oui" %}disabled{% endif %}' mode_conteneur_actif2: type: string description: No change default: non disabled: type: jinja - jinja: '{% if __condition == "oui" %}true{% else %}false{% endif %}' + jinja: '{% if __condition == "oui" %}disabled{% endif %}' disabled_family: mode_conteneur_actif3: type: string @@ -24,5 +24,5 @@ disabled_family: default: non disabled: type: jinja - jinja: '{% if __condition == "oui" %}true{% else %}false{% endif %}' -version: '1.0' + jinja: '{% if __condition == "oui" %}disabled{% endif %}' +version: '1.1' diff --git a/tests/dictionaries_old/40condition_optional/result/rougail/00-base.yml b/tests/dictionaries_old/40condition_optional/result/rougail/00-base.yml index 418ca0b54..73ca5c34e 100644 --- a/tests/dictionaries_old/40condition_optional/result/rougail/00-base.yml +++ b/tests/dictionaries_old/40condition_optional/result/rougail/00-base.yml @@ -13,6 +13,5 @@ general: default: non disabled: type: jinja - jinja: '{% if rougail.general.condition == "oui" %}true{% else %}false{% endif - %}' -version: '1.0' + jinja: '{% if rougail.general.condition == "oui" %}disabled{% endif %}' +version: '1.1' diff --git a/tests/dictionaries_old/40condition_optional_empty/result/rougail/00-base.yml b/tests/dictionaries_old/40condition_optional_empty/result/rougail/00-base.yml index b0508a169..d7e350ef6 100644 --- a/tests/dictionaries_old/40condition_optional_empty/result/rougail/00-base.yml +++ b/tests/dictionaries_old/40condition_optional_empty/result/rougail/00-base.yml @@ -11,4 +11,4 @@ general: type: string description: No change default: non -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/40condition_optional_family/result/rougail/00-base.yml b/tests/dictionaries_old/40condition_optional_family/result/rougail/00-base.yml index e6edda6cb..e82011933 100644 --- a/tests/dictionaries_old/40condition_optional_family/result/rougail/00-base.yml +++ b/tests/dictionaries_old/40condition_optional_family/result/rougail/00-base.yml @@ -5,5 +5,5 @@ general: mandatory: false disabled: type: jinja - jinja: '{% if rougail.condition == true %}true{% else %}false{% endif %}' -version: '1.0' + jinja: '{% if rougail.condition == true %}disabled{% endif %}' +version: '1.1' diff --git a/tests/dictionaries_old/40empty_param/result/rougail/00_base.yml b/tests/dictionaries_old/40empty_param/result/rougail/00_base.yml index 9c4de97a1..13018afb3 100644 --- a/tests/dictionaries_old/40empty_param/result/rougail/00_base.yml +++ b/tests/dictionaries_old/40empty_param/result/rougail/00_base.yml @@ -13,4 +13,4 @@ proxy_authentifie: description: Port d'écoute du proxy NTLM mode: advanced default: '3127' -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/40empty_param2/result/rougail/00_base.yml b/tests/dictionaries_old/40empty_param2/result/rougail/00_base.yml index 9c4de97a1..13018afb3 100644 --- a/tests/dictionaries_old/40empty_param2/result/rougail/00_base.yml +++ b/tests/dictionaries_old/40empty_param2/result/rougail/00_base.yml @@ -13,4 +13,4 @@ proxy_authentifie: description: Port d'écoute du proxy NTLM mode: advanced default: '3127' -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/40hidden_if_in_leadership_fallback/result/rougail/00-base.yml b/tests/dictionaries_old/40hidden_if_in_leadership_fallback/result/rougail/00-base.yml index 867b366ff..523e4301a 100644 --- a/tests/dictionaries_old/40hidden_if_in_leadership_fallback/result/rougail/00-base.yml +++ b/tests/dictionaries_old/40hidden_if_in_leadership_fallback/result/rougail/00-base.yml @@ -14,9 +14,9 @@ general: - non hidden: type: jinja - jinja: '{% if __condition == "oui" %}true{% else %}false{% endif %}' + jinja: '{% if __condition == "oui" %}hidden{% endif %}' mode_conteneur_actif2: type: string description: No change default: non -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/40ifin_leadership/result/rougail/00-base.yml b/tests/dictionaries_old/40ifin_leadership/result/rougail/00-base.yml index 59a450240..2427e2ced 100644 --- a/tests/dictionaries_old/40ifin_leadership/result/rougail/00-base.yml +++ b/tests/dictionaries_old/40ifin_leadership/result/rougail/00-base.yml @@ -21,10 +21,9 @@ general: mandatory: false disabled: type: jinja - jinja: '{% if rougail.general.condition == "oui" %}true{% else %}false{% endif - %}' + jinja: '{% if rougail.general.condition == "oui" %}disabled{% endif %}' follower2: type: string description: follower2 mandatory: false -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/40ifin_leadershipauto/result/rougail/00-base.yml b/tests/dictionaries_old/40ifin_leadershipauto/result/rougail/00-base.yml index b3b202a7a..8a28f7bc5 100644 --- a/tests/dictionaries_old/40ifin_leadershipauto/result/rougail/00-base.yml +++ b/tests/dictionaries_old/40ifin_leadershipauto/result/rougail/00-base.yml @@ -23,8 +23,7 @@ general: mandatory: false disabled: type: jinja - jinja: '{% if rougail.general.condition == "oui" %}true{% else %}false{% endif - %}' + jinja: '{% if rougail.general.condition == "oui" %}disabled{% endif %}' default: type: jinja jinja: '{{ "valfill" | calc_val }}' @@ -32,4 +31,4 @@ general: type: string description: follower2 mandatory: false -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/40ifin_leadershipauto/result/services/00-base.yml b/tests/dictionaries_old/40ifin_leadershipauto/result/services/00-base.yml index e25233253..39c1202b2 100644 --- a/tests/dictionaries_old/40ifin_leadershipauto/result/services/00-base.yml +++ b/tests/dictionaries_old/40ifin_leadershipauto/result/services/00-base.yml @@ -1,4 +1,4 @@ test.service: files: /etc/mailname: {} -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/40ifin_leadershipauto_follower/result/rougail/00-base.yml b/tests/dictionaries_old/40ifin_leadershipauto_follower/result/rougail/00-base.yml index 4454ecbf6..6c5628c7c 100644 --- a/tests/dictionaries_old/40ifin_leadershipauto_follower/result/rougail/00-base.yml +++ b/tests/dictionaries_old/40ifin_leadershipauto_follower/result/rougail/00-base.yml @@ -23,8 +23,7 @@ general: mandatory: false disabled: type: jinja - jinja: '{% if rougail.general.leader.leader == "a" %}true{% else %}false{% - endif %}' + jinja: '{% if rougail.general.leader.leader == "a" %}disabled{% endif %}' default: type: jinja jinja: '{{ "valfill" | calc_val }}' @@ -32,4 +31,4 @@ general: type: string description: follower2 mandatory: false -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/40ifin_leadershipauto_follower/result/services/00-base.yml b/tests/dictionaries_old/40ifin_leadershipauto_follower/result/services/00-base.yml index 01ae40493..e5c757d5f 100644 --- a/tests/dictionaries_old/40ifin_leadershipauto_follower/result/services/00-base.yml +++ b/tests/dictionaries_old/40ifin_leadershipauto_follower/result/services/00-base.yml @@ -3,4 +3,4 @@ test.service: /etc/mailname: {} /etc/mailname2: engine: jinja -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/40ifin_multi/result/rougail/00-base.yml b/tests/dictionaries_old/40ifin_multi/result/rougail/00-base.yml index c77570184..370cf4d5a 100644 --- a/tests/dictionaries_old/40ifin_multi/result/rougail/00-base.yml +++ b/tests/dictionaries_old/40ifin_multi/result/rougail/00-base.yml @@ -17,6 +17,6 @@ general2: default: non disabled: type: jinja - jinja: '{% if rougail.general2.mode_conteneur_actif2 == "oui" %}true{% else - %}false{% endif %}' -version: '1.0' + jinja: '{% if rougail.general2.mode_conteneur_actif2 == "oui" %}disabled{% endif + %}' +version: '1.1' diff --git a/tests/dictionaries_old/40ifin_multi2/result/rougail/00-base.yml b/tests/dictionaries_old/40ifin_multi2/result/rougail/00-base.yml index bb6799ab5..b5dd7ec89 100644 --- a/tests/dictionaries_old/40ifin_multi2/result/rougail/00-base.yml +++ b/tests/dictionaries_old/40ifin_multi2/result/rougail/00-base.yml @@ -17,6 +17,6 @@ general2: default: non disabled: type: jinja - jinja: '{% if rougail.general2.mode_conteneur_actif2 == "oui" %}true{% else - %}false{% endif %}' -version: '1.0' + jinja: '{% if rougail.general2.mode_conteneur_actif2 == "oui" %}disabled{% endif + %}' +version: '1.1' diff --git a/tests/dictionaries_old/40ifin_validenum/result/rougail/00-base.yml b/tests/dictionaries_old/40ifin_validenum/result/rougail/00-base.yml index 56ee00db4..326b78452 100644 --- a/tests/dictionaries_old/40ifin_validenum/result/rougail/00-base.yml +++ b/tests/dictionaries_old/40ifin_validenum/result/rougail/00-base.yml @@ -5,8 +5,8 @@ general: default: non disabled: type: jinja - jinja: '{% if rougail.general2.mode_conteneur_actif3 == "d" %}true{% else %}false{% - endif %}' + jinja: '{% if rougail.general2.mode_conteneur_actif3 == "d" %}disabled{% endif + %}' general2: hidden: true mode_conteneur_actif2: @@ -15,7 +15,7 @@ general2: default: non disabled: type: jinja - jinja: '{% if rougail.general2.mode_conteneur_actif3 == "d" %}false{% else %}true{% + jinja: '{% if rougail.general2.mode_conteneur_actif3 == "d" %}{% else %}disabled{% endif %}' mode_conteneur_actif3: type: choice @@ -25,4 +25,4 @@ general2: - a - b - c -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/40space_param/result/rougail/00_base.yml b/tests/dictionaries_old/40space_param/result/rougail/00_base.yml index 1625e1699..12fb3a826 100644 --- a/tests/dictionaries_old/40space_param/result/rougail/00_base.yml +++ b/tests/dictionaries_old/40space_param/result/rougail/00_base.yml @@ -13,4 +13,4 @@ proxy_authentifie: description: Port d'écoute du proxy NTLM mode: advanced default: '3127' -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/45extra_without_family/result/extra/00-base.yml b/tests/dictionaries_old/45extra_without_family/result/extra/00-base.yml index dbfe0d832..b4813db63 100644 --- a/tests/dictionaries_old/45extra_without_family/result/extra/00-base.yml +++ b/tests/dictionaries_old/45extra_without_family/result/extra/00-base.yml @@ -4,4 +4,4 @@ my_var: default: type: jinja jinja: '{{ "non" | calc_multi_condition }}' -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/45extra_without_family/result/rougail/00-base.yml b/tests/dictionaries_old/45extra_without_family/result/rougail/00-base.yml index dd35e17ad..7c437bd54 100644 --- a/tests/dictionaries_old/45extra_without_family/result/rougail/00-base.yml +++ b/tests/dictionaries_old/45extra_without_family/result/rougail/00-base.yml @@ -1,3 +1,3 @@ my_var: default: rougail -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/45extra_without_family/result/services/00-base.yml b/tests/dictionaries_old/45extra_without_family/result/services/00-base.yml index d1659db1b..e6c55cbb1 100644 --- a/tests/dictionaries_old/45extra_without_family/result/services/00-base.yml +++ b/tests/dictionaries_old/45extra_without_family/result/services/00-base.yml @@ -1,4 +1,4 @@ test.service: files: /etc/file: {} -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/45multi_family/result/rougail/00-base.yml b/tests/dictionaries_old/45multi_family/result/rougail/00-base.yml index 7a427a7d3..21729dc0c 100644 --- a/tests/dictionaries_old/45multi_family/result/rougail/00-base.yml +++ b/tests/dictionaries_old/45multi_family/result/rougail/00-base.yml @@ -2,4 +2,4 @@ base: subfamily: variable: mandatory: false -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/45multi_family_basic/result/rougail/00-base.yml b/tests/dictionaries_old/45multi_family_basic/result/rougail/00-base.yml index 3670e3c24..27cb1b9d5 100644 --- a/tests/dictionaries_old/45multi_family_basic/result/rougail/00-base.yml +++ b/tests/dictionaries_old/45multi_family_basic/result/rougail/00-base.yml @@ -3,4 +3,4 @@ base: variable: mode: basic mandatory: false -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/45multi_family_expert/result/rougail/00-base.yml b/tests/dictionaries_old/45multi_family_expert/result/rougail/00-base.yml index 9e6e9efed..6fa19ef72 100644 --- a/tests/dictionaries_old/45multi_family_expert/result/rougail/00-base.yml +++ b/tests/dictionaries_old/45multi_family_expert/result/rougail/00-base.yml @@ -3,4 +3,4 @@ base: subfamily: variable: mandatory: false -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/45multi_family_order/result/rougail/00-base.yml b/tests/dictionaries_old/45multi_family_order/result/rougail/00-base.yml index add446d74..b99b8ae88 100644 --- a/tests/dictionaries_old/45multi_family_order/result/rougail/00-base.yml +++ b/tests/dictionaries_old/45multi_family_order/result/rougail/00-base.yml @@ -8,4 +8,4 @@ base: mandatory: false variable4: mandatory: false -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/45without_family/result/rougail/00-base.yml b/tests/dictionaries_old/45without_family/result/rougail/00-base.yml index 5a86c1b1f..061246208 100644 --- a/tests/dictionaries_old/45without_family/result/rougail/00-base.yml +++ b/tests/dictionaries_old/45without_family/result/rougail/00-base.yml @@ -1,3 +1,3 @@ variable: mandatory: false -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/50exists_exists/result/rougail/00-base.yml b/tests/dictionaries_old/50exists_exists/result/rougail/00-base.yml index 98b2ee4ba..69551e928 100644 --- a/tests/dictionaries_old/50exists_exists/result/rougail/00-base.yml +++ b/tests/dictionaries_old/50exists_exists/result/rougail/00-base.yml @@ -4,4 +4,4 @@ general: description: Description hidden: true default: non -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/50exists_exists/result/rougail/01-base.yml b/tests/dictionaries_old/50exists_exists/result/rougail/01-base.yml index 5942a802a..e367e62c4 100644 --- a/tests/dictionaries_old/50exists_exists/result/rougail/01-base.yml +++ b/tests/dictionaries_old/50exists_exists/result/rougail/01-base.yml @@ -4,4 +4,4 @@ general: description: New description exists: false default: oui -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/50redefine_description/result/rougail/00-base.yml b/tests/dictionaries_old/50redefine_description/result/rougail/00-base.yml index da1ea3c58..afada5552 100644 --- a/tests/dictionaries_old/50redefine_description/result/rougail/00-base.yml +++ b/tests/dictionaries_old/50redefine_description/result/rougail/00-base.yml @@ -4,4 +4,4 @@ general: description: Redefine description hidden: true default: non -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/50redefine_description/result/rougail/01-redefine.yml b/tests/dictionaries_old/50redefine_description/result/rougail/01-redefine.yml index 24ab230e5..57bed7d3b 100644 --- a/tests/dictionaries_old/50redefine_description/result/rougail/01-redefine.yml +++ b/tests/dictionaries_old/50redefine_description/result/rougail/01-redefine.yml @@ -2,4 +2,4 @@ general: mode_conteneur_actif: redefine: true description: Redefined -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/51exists_nonexists/result/rougail/00-base.yml b/tests/dictionaries_old/51exists_nonexists/result/rougail/00-base.yml index f3ac44820..166911aef 100644 --- a/tests/dictionaries_old/51exists_nonexists/result/rougail/00-base.yml +++ b/tests/dictionaries_old/51exists_nonexists/result/rougail/00-base.yml @@ -8,4 +8,4 @@ general: description: Description hidden: true default: non -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/51exists_nonexists/result/rougail/01-base.yml b/tests/dictionaries_old/51exists_nonexists/result/rougail/01-base.yml index 4ebe57964..7737eec74 100644 --- a/tests/dictionaries_old/51exists_nonexists/result/rougail/01-base.yml +++ b/tests/dictionaries_old/51exists_nonexists/result/rougail/01-base.yml @@ -4,4 +4,4 @@ general: description: New description exists: false default: oui -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/51exists_redefine/result/rougail/00-base.yml b/tests/dictionaries_old/51exists_redefine/result/rougail/00-base.yml index 98b2ee4ba..69551e928 100644 --- a/tests/dictionaries_old/51exists_redefine/result/rougail/00-base.yml +++ b/tests/dictionaries_old/51exists_redefine/result/rougail/00-base.yml @@ -4,4 +4,4 @@ general: description: Description hidden: true default: non -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/51exists_redefine/result/rougail/01-base.yml b/tests/dictionaries_old/51exists_redefine/result/rougail/01-base.yml index 238b1bb47..f53e5ac9e 100644 --- a/tests/dictionaries_old/51exists_redefine/result/rougail/01-base.yml +++ b/tests/dictionaries_old/51exists_redefine/result/rougail/01-base.yml @@ -7,4 +7,4 @@ general: redefine: true exists: true default: oui -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/51redefine_auto/result/rougail/00-base.yml b/tests/dictionaries_old/51redefine_auto/result/rougail/00-base.yml index a30a45a99..8a5afe519 100644 --- a/tests/dictionaries_old/51redefine_auto/result/rougail/00-base.yml +++ b/tests/dictionaries_old/51redefine_auto/result/rougail/00-base.yml @@ -6,4 +6,4 @@ general: default: type: jinja jinja: '{{ "non" | calc_val }}' -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/51redefine_auto/result/rougail/01-base.yml b/tests/dictionaries_old/51redefine_auto/result/rougail/01-base.yml index 3dd4c3524..e4e0d1638 100644 --- a/tests/dictionaries_old/51redefine_auto/result/rougail/01-base.yml +++ b/tests/dictionaries_old/51redefine_auto/result/rougail/01-base.yml @@ -4,4 +4,4 @@ general: default: type: jinja jinja: '{{ "non" | concat }}' -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/51redefine_autofill/result/rougail/00-base.yml b/tests/dictionaries_old/51redefine_autofill/result/rougail/00-base.yml index 4bd6a838b..dc894c589 100644 --- a/tests/dictionaries_old/51redefine_autofill/result/rougail/00-base.yml +++ b/tests/dictionaries_old/51redefine_autofill/result/rougail/00-base.yml @@ -6,4 +6,4 @@ general: default: type: jinja jinja: '{{ "oui" | calc_val }}' -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/51redefine_autofill/result/rougail/01-base.yml b/tests/dictionaries_old/51redefine_autofill/result/rougail/01-base.yml index 5fe628160..a8447c859 100644 --- a/tests/dictionaries_old/51redefine_autofill/result/rougail/01-base.yml +++ b/tests/dictionaries_old/51redefine_autofill/result/rougail/01-base.yml @@ -5,4 +5,4 @@ general: default: type: jinja jinja: '{{ "non" | concat }}' -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/51redefine_family/result/rougail/00-base.yml b/tests/dictionaries_old/51redefine_family/result/rougail/00-base.yml index 2655d6635..06c28ff1b 100644 --- a/tests/dictionaries_old/51redefine_family/result/rougail/00-base.yml +++ b/tests/dictionaries_old/51redefine_family/result/rougail/00-base.yml @@ -13,6 +13,6 @@ general2: default: non disabled: type: jinja - jinja: '{% if rougail.general.mode_conteneur_actif == "oui" %}true{% else %}false{% - endif %}' -version: '1.0' + jinja: '{% if rougail.general.mode_conteneur_actif == "oui" %}disabled{% endif + %}' +version: '1.1' diff --git a/tests/dictionaries_old/51redefine_family/result/rougail/01-base.yml b/tests/dictionaries_old/51redefine_family/result/rougail/01-base.yml index 84dcc917c..584239f38 100644 --- a/tests/dictionaries_old/51redefine_family/result/rougail/01-base.yml +++ b/tests/dictionaries_old/51redefine_family/result/rougail/01-base.yml @@ -2,4 +2,4 @@ general: mode_conteneur_actif: redefine: true default: non -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/51redefine_fill/result/rougail/00-base.yml b/tests/dictionaries_old/51redefine_fill/result/rougail/00-base.yml index 4bd6a838b..dc894c589 100644 --- a/tests/dictionaries_old/51redefine_fill/result/rougail/00-base.yml +++ b/tests/dictionaries_old/51redefine_fill/result/rougail/00-base.yml @@ -6,4 +6,4 @@ general: default: type: jinja jinja: '{{ "oui" | calc_val }}' -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/51redefine_fill/result/rougail/01-base.yml b/tests/dictionaries_old/51redefine_fill/result/rougail/01-base.yml index 3dd4c3524..e4e0d1638 100644 --- a/tests/dictionaries_old/51redefine_fill/result/rougail/01-base.yml +++ b/tests/dictionaries_old/51redefine_fill/result/rougail/01-base.yml @@ -4,4 +4,4 @@ general: default: type: jinja jinja: '{{ "non" | concat }}' -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/51redefine_fillauto/result/rougail/00-base.yml b/tests/dictionaries_old/51redefine_fillauto/result/rougail/00-base.yml index 2408964ed..bd5b136e3 100644 --- a/tests/dictionaries_old/51redefine_fillauto/result/rougail/00-base.yml +++ b/tests/dictionaries_old/51redefine_fillauto/result/rougail/00-base.yml @@ -5,4 +5,4 @@ general: default: type: jinja jinja: '{{ "oui" | calc_val }}' -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/51redefine_fillauto/result/rougail/01-base.yml b/tests/dictionaries_old/51redefine_fillauto/result/rougail/01-base.yml index df07c6509..eb5d3828e 100644 --- a/tests/dictionaries_old/51redefine_fillauto/result/rougail/01-base.yml +++ b/tests/dictionaries_old/51redefine_fillauto/result/rougail/01-base.yml @@ -5,4 +5,4 @@ general: default: type: jinja jinja: '{{ "non" | concat }}' -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/51redefine_help/result/rougail/00-base.yml b/tests/dictionaries_old/51redefine_help/result/rougail/00-base.yml index 75b1e935b..7e702d417 100644 --- a/tests/dictionaries_old/51redefine_help/result/rougail/00-base.yml +++ b/tests/dictionaries_old/51redefine_help/result/rougail/00-base.yml @@ -6,4 +6,4 @@ general: hidden: true help: redefine help default: non -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/51redefine_help/result/rougail/01-base.yml b/tests/dictionaries_old/51redefine_help/result/rougail/01-base.yml index 465f7a2c0..3eb540d1a 100644 --- a/tests/dictionaries_old/51redefine_help/result/rougail/01-base.yml +++ b/tests/dictionaries_old/51redefine_help/result/rougail/01-base.yml @@ -6,4 +6,4 @@ general: hidden: true help: redefine help ok default: non -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/51redefine_hidden/result/rougail/00-base.yml b/tests/dictionaries_old/51redefine_hidden/result/rougail/00-base.yml index 01b94adff..983d0945e 100644 --- a/tests/dictionaries_old/51redefine_hidden/result/rougail/00-base.yml +++ b/tests/dictionaries_old/51redefine_hidden/result/rougail/00-base.yml @@ -3,4 +3,4 @@ general: type: string description: Redefine hidden default: non -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/51redefine_hidden/result/rougail/01-redefine.yml b/tests/dictionaries_old/51redefine_hidden/result/rougail/01-redefine.yml index a98fe3a5a..d96d15eda 100644 --- a/tests/dictionaries_old/51redefine_hidden/result/rougail/01-redefine.yml +++ b/tests/dictionaries_old/51redefine_hidden/result/rougail/01-redefine.yml @@ -2,4 +2,4 @@ general: mode_conteneur_actif: redefine: true hidden: true -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/51redefine_hidden_inverse/result/rougail/00-base.yml b/tests/dictionaries_old/51redefine_hidden_inverse/result/rougail/00-base.yml index 709c26c30..95c2fb04d 100644 --- a/tests/dictionaries_old/51redefine_hidden_inverse/result/rougail/00-base.yml +++ b/tests/dictionaries_old/51redefine_hidden_inverse/result/rougail/00-base.yml @@ -4,4 +4,4 @@ general: description: Redefine hidden hidden: true default: non -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/51redefine_hidden_inverse/result/rougail/01-redefine.yml b/tests/dictionaries_old/51redefine_hidden_inverse/result/rougail/01-redefine.yml index b695912b8..41e3af061 100644 --- a/tests/dictionaries_old/51redefine_hidden_inverse/result/rougail/01-redefine.yml +++ b/tests/dictionaries_old/51redefine_hidden_inverse/result/rougail/01-redefine.yml @@ -2,4 +2,4 @@ general: mode_conteneur_actif: redefine: true hidden: false -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/51redefine_multi/result/rougail/00-base.yml b/tests/dictionaries_old/51redefine_multi/result/rougail/00-base.yml index da1ea3c58..afada5552 100644 --- a/tests/dictionaries_old/51redefine_multi/result/rougail/00-base.yml +++ b/tests/dictionaries_old/51redefine_multi/result/rougail/00-base.yml @@ -4,4 +4,4 @@ general: description: Redefine description hidden: true default: non -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/51redefine_multi/result/rougail/01-redefine.yml b/tests/dictionaries_old/51redefine_multi/result/rougail/01-redefine.yml index 0358df0a4..f7f1fd36a 100644 --- a/tests/dictionaries_old/51redefine_multi/result/rougail/01-redefine.yml +++ b/tests/dictionaries_old/51redefine_multi/result/rougail/01-redefine.yml @@ -4,4 +4,4 @@ general: multi: true default: - non -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/51redefine_remove_condition/result/rougail/00-base.yml b/tests/dictionaries_old/51redefine_remove_condition/result/rougail/00-base.yml index 395ca775c..d5870b80a 100644 --- a/tests/dictionaries_old/51redefine_remove_condition/result/rougail/00-base.yml +++ b/tests/dictionaries_old/51redefine_remove_condition/result/rougail/00-base.yml @@ -14,14 +14,12 @@ general: default: non disabled: type: jinja - jinja: '{% if rougail.general.condition == "oui" %}true{% else %}false{% endif - %}' + jinja: '{% if rougail.general.condition == "oui" %}disabled{% endif %}' mode_conteneur_actif2: type: string description: No change default: non disabled: type: jinja - jinja: '{% if rougail.general.condition == "oui" %}true{% else %}false{% endif - %}' -version: '1.0' + jinja: '{% if rougail.general.condition == "oui" %}disabled{% endif %}' +version: '1.1' diff --git a/tests/dictionaries_old/51redefine_remove_condition/result/rougail/01-base.yml b/tests/dictionaries_old/51redefine_remove_condition/result/rougail/01-base.yml index d80321891..fe288f974 100644 --- a/tests/dictionaries_old/51redefine_remove_condition/result/rougail/01-base.yml +++ b/tests/dictionaries_old/51redefine_remove_condition/result/rougail/01-base.yml @@ -4,4 +4,4 @@ general: hidden: false disabled: false mandatory: false -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/51redefine_remove_condition_filelist/result/rougail/00-base.yml b/tests/dictionaries_old/51redefine_remove_condition_filelist/result/rougail/00-base.yml index 395ca775c..d5870b80a 100644 --- a/tests/dictionaries_old/51redefine_remove_condition_filelist/result/rougail/00-base.yml +++ b/tests/dictionaries_old/51redefine_remove_condition_filelist/result/rougail/00-base.yml @@ -14,14 +14,12 @@ general: default: non disabled: type: jinja - jinja: '{% if rougail.general.condition == "oui" %}true{% else %}false{% endif - %}' + jinja: '{% if rougail.general.condition == "oui" %}disabled{% endif %}' mode_conteneur_actif2: type: string description: No change default: non disabled: type: jinja - jinja: '{% if rougail.general.condition == "oui" %}true{% else %}false{% endif - %}' -version: '1.0' + jinja: '{% if rougail.general.condition == "oui" %}disabled{% endif %}' +version: '1.1' diff --git a/tests/dictionaries_old/51redefine_remove_condition_filelist/result/rougail/01-base.yml b/tests/dictionaries_old/51redefine_remove_condition_filelist/result/rougail/01-base.yml index d80321891..fe288f974 100644 --- a/tests/dictionaries_old/51redefine_remove_condition_filelist/result/rougail/01-base.yml +++ b/tests/dictionaries_old/51redefine_remove_condition_filelist/result/rougail/01-base.yml @@ -4,4 +4,4 @@ general: hidden: false disabled: false mandatory: false -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/51redefine_remove_condition_filelist/result/services/00-base.yml b/tests/dictionaries_old/51redefine_remove_condition_filelist/result/services/00-base.yml index 91273e771..0981730b1 100644 --- a/tests/dictionaries_old/51redefine_remove_condition_filelist/result/services/00-base.yml +++ b/tests/dictionaries_old/51redefine_remove_condition_filelist/result/services/00-base.yml @@ -3,6 +3,5 @@ test.service: /etc/file: disabled: type: jinja - jinja: '{% if rougail.general.condition == "oui" %}true{% else %}false{% endif - %}' -version: '1.0' + jinja: '{% if rougail.general.condition == "oui" %}disabled{% endif %}' +version: '1.1' diff --git a/tests/dictionaries_old/51redefine_removecondition_nonautofreeze/result/rougail/00-base.yml b/tests/dictionaries_old/51redefine_removecondition_nonautofreeze/result/rougail/00-base.yml index 916758354..81a525ffd 100644 --- a/tests/dictionaries_old/51redefine_removecondition_nonautofreeze/result/rougail/00-base.yml +++ b/tests/dictionaries_old/51redefine_removecondition_nonautofreeze/result/rougail/00-base.yml @@ -7,14 +7,14 @@ my_var1: default: 'no' disabled: type: jinja - jinja: '{% if rougail.condition == "yes" %}true{% else %}false{% endif %}' + jinja: '{% if rougail.condition == "yes" %}disabled{% endif %}' my_var2: default: 'no' disabled: type: jinja - jinja: '{% if rougail.condition == "yes" %}true{% else %}false{% endif %}' + jinja: '{% if rougail.condition == "yes" %}disabled{% endif %}' server_deployed: type: boolean hidden: true default: false -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/51redefine_removecondition_nonautofreeze/result/rougail/01-base.yml b/tests/dictionaries_old/51redefine_removecondition_nonautofreeze/result/rougail/01-base.yml index 9147370ae..ed714999d 100644 --- a/tests/dictionaries_old/51redefine_removecondition_nonautofreeze/result/rougail/01-base.yml +++ b/tests/dictionaries_old/51redefine_removecondition_nonautofreeze/result/rougail/01-base.yml @@ -3,4 +3,4 @@ condition: hidden: false disabled: false mandatory: false -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/51redefine_validenum/result/rougail/00-base.yml b/tests/dictionaries_old/51redefine_validenum/result/rougail/00-base.yml index fef3650ba..ff07e42ec 100644 --- a/tests/dictionaries_old/51redefine_validenum/result/rougail/00-base.yml +++ b/tests/dictionaries_old/51redefine_validenum/result/rougail/00-base.yml @@ -8,4 +8,4 @@ general: - a - b - c -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/51redefine_validenum/result/rougail/01-redefine.yml b/tests/dictionaries_old/51redefine_validenum/result/rougail/01-redefine.yml index 8babcec2f..c8a346692 100644 --- a/tests/dictionaries_old/51redefine_validenum/result/rougail/01-redefine.yml +++ b/tests/dictionaries_old/51redefine_validenum/result/rougail/01-redefine.yml @@ -6,4 +6,4 @@ general: choices: - a - b -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/51redefine_value/result/rougail/00-base.yml b/tests/dictionaries_old/51redefine_value/result/rougail/00-base.yml index 74c33aee8..dac0d3b68 100644 --- a/tests/dictionaries_old/51redefine_value/result/rougail/00-base.yml +++ b/tests/dictionaries_old/51redefine_value/result/rougail/00-base.yml @@ -8,4 +8,4 @@ general: description: Redefine value hidden: true default: non -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/51redefine_value/result/rougail/01-redefine.yml b/tests/dictionaries_old/51redefine_value/result/rougail/01-redefine.yml index c9908834d..7f8159433 100644 --- a/tests/dictionaries_old/51redefine_value/result/rougail/01-redefine.yml +++ b/tests/dictionaries_old/51redefine_value/result/rougail/01-redefine.yml @@ -2,4 +2,4 @@ general: mode_conteneur_actif1: redefine: true default: oui -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/51redefine_without_hidden/result/rougail/00-base.yml b/tests/dictionaries_old/51redefine_without_hidden/result/rougail/00-base.yml index 709c26c30..95c2fb04d 100644 --- a/tests/dictionaries_old/51redefine_without_hidden/result/rougail/00-base.yml +++ b/tests/dictionaries_old/51redefine_without_hidden/result/rougail/00-base.yml @@ -4,4 +4,4 @@ general: description: Redefine hidden hidden: true default: non -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/51redefine_without_hidden/result/rougail/01-redefine.yml b/tests/dictionaries_old/51redefine_without_hidden/result/rougail/01-redefine.yml index 7c59b7f2b..46f96ad17 100644 --- a/tests/dictionaries_old/51redefine_without_hidden/result/rougail/01-redefine.yml +++ b/tests/dictionaries_old/51redefine_without_hidden/result/rougail/01-redefine.yml @@ -1,4 +1,4 @@ general: mode_conteneur_actif: redefine: true -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/51remove_fill/result/rougail/00-base.yml b/tests/dictionaries_old/51remove_fill/result/rougail/00-base.yml index ab500946e..1dd8bb935 100644 --- a/tests/dictionaries_old/51remove_fill/result/rougail/00-base.yml +++ b/tests/dictionaries_old/51remove_fill/result/rougail/00-base.yml @@ -9,4 +9,4 @@ general: type: string description: No change default: non -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/51remove_fill/result/rougail/01-base.yml b/tests/dictionaries_old/51remove_fill/result/rougail/01-base.yml index 7c59b7f2b..46f96ad17 100644 --- a/tests/dictionaries_old/51remove_fill/result/rougail/01-base.yml +++ b/tests/dictionaries_old/51remove_fill/result/rougail/01-base.yml @@ -1,4 +1,4 @@ general: mode_conteneur_actif: redefine: true -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/52exists_redefine/result/rougail/00-base.yml b/tests/dictionaries_old/52exists_redefine/result/rougail/00-base.yml index 2ae1c0b3c..c933faf3c 100644 --- a/tests/dictionaries_old/52exists_redefine/result/rougail/00-base.yml +++ b/tests/dictionaries_old/52exists_redefine/result/rougail/00-base.yml @@ -4,4 +4,4 @@ general: description: Description hidden: true default: oui -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/52exists_redefine/result/rougail/01-base.yml b/tests/dictionaries_old/52exists_redefine/result/rougail/01-base.yml index 0d15d53d4..1c7a6eb72 100644 --- a/tests/dictionaries_old/52exists_redefine/result/rougail/01-base.yml +++ b/tests/dictionaries_old/52exists_redefine/result/rougail/01-base.yml @@ -4,4 +4,4 @@ general: exists: false redefine: true default: non -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/60action_external/result/extra/00-base.yml b/tests/dictionaries_old/60action_external/result/extra/00-base.yml index 0019b91e9..46806e9c1 100644 --- a/tests/dictionaries_old/60action_external/result/extra/00-base.yml +++ b/tests/dictionaries_old/60action_external/result/extra/00-base.yml @@ -10,4 +10,4 @@ test: default: type: jinja jinja: '{{ "http://localhost/" | calc_val }}' -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/60action_external/result/rougail/00-base.yml b/tests/dictionaries_old/60action_external/result/rougail/00-base.yml index 1085cc1cc..efac7c360 100644 --- a/tests/dictionaries_old/60action_external/result/rougail/00-base.yml +++ b/tests/dictionaries_old/60action_external/result/rougail/00-base.yml @@ -5,4 +5,4 @@ general: description: No change hidden: true default: non -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/60extra_basic/result/extra/00-base.yml b/tests/dictionaries_old/60extra_basic/result/extra/00-base.yml index 535c9a803..9bd356524 100644 --- a/tests/dictionaries_old/60extra_basic/result/extra/00-base.yml +++ b/tests/dictionaries_old/60extra_basic/result/extra/00-base.yml @@ -27,4 +27,4 @@ ejabberd: choices: - pre - post -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/60extra_basic/result/rougail/00-base.yml b/tests/dictionaries_old/60extra_basic/result/rougail/00-base.yml index 1a857b0d1..21111e913 100644 --- a/tests/dictionaries_old/60extra_basic/result/rougail/00-base.yml +++ b/tests/dictionaries_old/60extra_basic/result/rougail/00-base.yml @@ -10,4 +10,4 @@ general: description: No change hidden: true default: non -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/60extra_externalspacecondition/result/extra/00-base.yml b/tests/dictionaries_old/60extra_externalspacecondition/result/extra/00-base.yml index 47d02767d..d6b6ccc5e 100644 --- a/tests/dictionaries_old/60extra_externalspacecondition/result/extra/00-base.yml +++ b/tests/dictionaries_old/60extra_externalspacecondition/result/extra/00-base.yml @@ -18,4 +18,4 @@ ejabberd: choices: - pre - post -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/60extra_externalspacecondition/result/extra1/00-base.yml b/tests/dictionaries_old/60extra_externalspacecondition/result/extra1/00-base.yml index 91eae1a55..1d3478169 100644 --- a/tests/dictionaries_old/60extra_externalspacecondition/result/extra1/00-base.yml +++ b/tests/dictionaries_old/60extra_externalspacecondition/result/extra1/00-base.yml @@ -4,6 +4,5 @@ external: default: test disabled: type: jinja - jinja: '{% if __extra.ejabberd.description == "non" %}true{% else %}false{% endif - %}' -version: '1.0' + jinja: '{% if __extra.ejabberd.description == "non" %}disabled{% endif %}' +version: '1.1' diff --git a/tests/dictionaries_old/60extra_externalspacecondition/result/rougail/00-base.yml b/tests/dictionaries_old/60extra_externalspacecondition/result/rougail/00-base.yml index c166f473e..165695cb9 100644 --- a/tests/dictionaries_old/60extra_externalspacecondition/result/rougail/00-base.yml +++ b/tests/dictionaries_old/60extra_externalspacecondition/result/rougail/00-base.yml @@ -9,4 +9,4 @@ general: type: boolean hidden: true default: false -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/60extra_help/result/extra/00-base.yml b/tests/dictionaries_old/60extra_help/result/extra/00-base.yml index d14b84e1b..acb8c5f32 100644 --- a/tests/dictionaries_old/60extra_help/result/extra/00-base.yml +++ b/tests/dictionaries_old/60extra_help/result/extra/00-base.yml @@ -27,4 +27,4 @@ ejabberd: choices: - pre - post -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/60extra_help/result/rougail/00-base.yml b/tests/dictionaries_old/60extra_help/result/rougail/00-base.yml index 1a857b0d1..21111e913 100644 --- a/tests/dictionaries_old/60extra_help/result/rougail/00-base.yml +++ b/tests/dictionaries_old/60extra_help/result/rougail/00-base.yml @@ -10,4 +10,4 @@ general: description: No change hidden: true default: non -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/60extra_help/result/services/00-base.yml b/tests/dictionaries_old/60extra_help/result/services/00-base.yml index e25233253..39c1202b2 100644 --- a/tests/dictionaries_old/60extra_help/result/services/00-base.yml +++ b/tests/dictionaries_old/60extra_help/result/services/00-base.yml @@ -1,4 +1,4 @@ test.service: files: /etc/mailname: {} -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/60extra_leadership/result/extra/00-base.yml b/tests/dictionaries_old/60extra_leadership/result/extra/00-base.yml index eacf9828e..95cac7133 100644 --- a/tests/dictionaries_old/60extra_leadership/result/extra/00-base.yml +++ b/tests/dictionaries_old/60extra_leadership/result/extra/00-base.yml @@ -10,4 +10,4 @@ ejabberd: mode: type: string default: pre -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/60extra_leadership/result/rougail/00-base.yml b/tests/dictionaries_old/60extra_leadership/result/rougail/00-base.yml index 1a857b0d1..21111e913 100644 --- a/tests/dictionaries_old/60extra_leadership/result/rougail/00-base.yml +++ b/tests/dictionaries_old/60extra_leadership/result/rougail/00-base.yml @@ -10,4 +10,4 @@ general: description: No change hidden: true default: non -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/60extra_leadership/result/services/00-base.yml b/tests/dictionaries_old/60extra_leadership/result/services/00-base.yml index 01ae40493..e5c757d5f 100644 --- a/tests/dictionaries_old/60extra_leadership/result/services/00-base.yml +++ b/tests/dictionaries_old/60extra_leadership/result/services/00-base.yml @@ -3,4 +3,4 @@ test.service: /etc/mailname: {} /etc/mailname2: engine: jinja -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/60extra_leadership_name/result/extra/00-base.yml b/tests/dictionaries_old/60extra_leadership_name/result/extra/00-base.yml index d3a06a971..96527595f 100644 --- a/tests/dictionaries_old/60extra_leadership_name/result/extra/00-base.yml +++ b/tests/dictionaries_old/60extra_leadership_name/result/extra/00-base.yml @@ -10,4 +10,4 @@ ejabberd: mode: type: string default: pre -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/60extra_leadership_name/result/rougail/00-base.yml b/tests/dictionaries_old/60extra_leadership_name/result/rougail/00-base.yml index 1a857b0d1..21111e913 100644 --- a/tests/dictionaries_old/60extra_leadership_name/result/rougail/00-base.yml +++ b/tests/dictionaries_old/60extra_leadership_name/result/rougail/00-base.yml @@ -10,4 +10,4 @@ general: description: No change hidden: true default: non -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/60extra_leadership_name/result/services/00-base.yml b/tests/dictionaries_old/60extra_leadership_name/result/services/00-base.yml index 01ae40493..e5c757d5f 100644 --- a/tests/dictionaries_old/60extra_leadership_name/result/services/00-base.yml +++ b/tests/dictionaries_old/60extra_leadership_name/result/services/00-base.yml @@ -3,4 +3,4 @@ test.service: /etc/mailname: {} /etc/mailname2: engine: jinja -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/60extra_leadership_name_item/result/extra/00-base.yml b/tests/dictionaries_old/60extra_leadership_name_item/result/extra/00-base.yml index d3a06a971..96527595f 100644 --- a/tests/dictionaries_old/60extra_leadership_name_item/result/extra/00-base.yml +++ b/tests/dictionaries_old/60extra_leadership_name_item/result/extra/00-base.yml @@ -10,4 +10,4 @@ ejabberd: mode: type: string default: pre -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/60extra_leadership_name_item/result/rougail/00-base.yml b/tests/dictionaries_old/60extra_leadership_name_item/result/rougail/00-base.yml index 1a857b0d1..21111e913 100644 --- a/tests/dictionaries_old/60extra_leadership_name_item/result/rougail/00-base.yml +++ b/tests/dictionaries_old/60extra_leadership_name_item/result/rougail/00-base.yml @@ -10,4 +10,4 @@ general: description: No change hidden: true default: non -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/60extra_leadership_name_item/result/services/00-base.yml b/tests/dictionaries_old/60extra_leadership_name_item/result/services/00-base.yml index 01ae40493..e5c757d5f 100644 --- a/tests/dictionaries_old/60extra_leadership_name_item/result/services/00-base.yml +++ b/tests/dictionaries_old/60extra_leadership_name_item/result/services/00-base.yml @@ -3,4 +3,4 @@ test.service: /etc/mailname: {} /etc/mailname2: engine: jinja -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/60extra_leadership_valid_enum/result/extra/00-base.yml b/tests/dictionaries_old/60extra_leadership_valid_enum/result/extra/00-base.yml index 982b50447..2cfda2bf3 100644 --- a/tests/dictionaries_old/60extra_leadership_valid_enum/result/extra/00-base.yml +++ b/tests/dictionaries_old/60extra_leadership_valid_enum/result/extra/00-base.yml @@ -13,4 +13,4 @@ ejabberd: choices: - pre - post -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/60extra_leadership_valid_enum/result/rougail/00-base.yml b/tests/dictionaries_old/60extra_leadership_valid_enum/result/rougail/00-base.yml index 1a857b0d1..21111e913 100644 --- a/tests/dictionaries_old/60extra_leadership_valid_enum/result/rougail/00-base.yml +++ b/tests/dictionaries_old/60extra_leadership_valid_enum/result/rougail/00-base.yml @@ -10,4 +10,4 @@ general: description: No change hidden: true default: non -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/60extra_leadership_valid_enum/result/services/00-base.yml b/tests/dictionaries_old/60extra_leadership_valid_enum/result/services/00-base.yml index 01ae40493..e5c757d5f 100644 --- a/tests/dictionaries_old/60extra_leadership_valid_enum/result/services/00-base.yml +++ b/tests/dictionaries_old/60extra_leadership_valid_enum/result/services/00-base.yml @@ -3,4 +3,4 @@ test.service: /etc/mailname: {} /etc/mailname2: engine: jinja -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/60extra_load/result/extra/00-base.yml b/tests/dictionaries_old/60extra_load/result/extra/00-base.yml index 83dfcc6c1..8b59e0c07 100644 --- a/tests/dictionaries_old/60extra_load/result/extra/00-base.yml +++ b/tests/dictionaries_old/60extra_load/result/extra/00-base.yml @@ -26,4 +26,4 @@ ejabberd: choices: - pre - post -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/60extra_load/result/rougail/00-base.yml b/tests/dictionaries_old/60extra_load/result/rougail/00-base.yml index 1a857b0d1..21111e913 100644 --- a/tests/dictionaries_old/60extra_load/result/rougail/00-base.yml +++ b/tests/dictionaries_old/60extra_load/result/rougail/00-base.yml @@ -10,4 +10,4 @@ general: description: No change hidden: true default: non -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/60extra_mandatory/result/extra/00-base.yml b/tests/dictionaries_old/60extra_mandatory/result/extra/00-base.yml index 8cf984b33..9f8727d7b 100644 --- a/tests/dictionaries_old/60extra_mandatory/result/extra/00-base.yml +++ b/tests/dictionaries_old/60extra_mandatory/result/extra/00-base.yml @@ -29,4 +29,4 @@ ejabberd: var1: type: string mandatory: true -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/60extra_mandatory/result/rougail/00-base.yml b/tests/dictionaries_old/60extra_mandatory/result/rougail/00-base.yml index 1a857b0d1..21111e913 100644 --- a/tests/dictionaries_old/60extra_mandatory/result/rougail/00-base.yml +++ b/tests/dictionaries_old/60extra_mandatory/result/rougail/00-base.yml @@ -10,4 +10,4 @@ general: description: No change hidden: true default: non -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/60extra_name_family/result/extra/00-base.yml b/tests/dictionaries_old/60extra_name_family/result/extra/00-base.yml index 83dfcc6c1..8b59e0c07 100644 --- a/tests/dictionaries_old/60extra_name_family/result/extra/00-base.yml +++ b/tests/dictionaries_old/60extra_name_family/result/extra/00-base.yml @@ -26,4 +26,4 @@ ejabberd: choices: - pre - post -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/60extra_name_family/result/rougail/00-base.yml b/tests/dictionaries_old/60extra_name_family/result/rougail/00-base.yml index 2d97f1169..52bd58d8b 100644 --- a/tests/dictionaries_old/60extra_name_family/result/rougail/00-base.yml +++ b/tests/dictionaries_old/60extra_name_family/result/rougail/00-base.yml @@ -9,4 +9,4 @@ extra: description: No change hidden: true default: non -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/60extra_no_condition/result/extra/00-base.yml b/tests/dictionaries_old/60extra_no_condition/result/extra/00-base.yml index 47d02767d..d6b6ccc5e 100644 --- a/tests/dictionaries_old/60extra_no_condition/result/extra/00-base.yml +++ b/tests/dictionaries_old/60extra_no_condition/result/extra/00-base.yml @@ -18,4 +18,4 @@ ejabberd: choices: - pre - post -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/60extra_no_condition/result/rougail/00-base.yml b/tests/dictionaries_old/60extra_no_condition/result/rougail/00-base.yml index 4c7f61ce1..2a59d9b96 100644 --- a/tests/dictionaries_old/60extra_no_condition/result/rougail/00-base.yml +++ b/tests/dictionaries_old/60extra_no_condition/result/rougail/00-base.yml @@ -14,4 +14,4 @@ general: description: No change hidden: true default: non -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/60extra_redefine/result/extra/00-base.yml b/tests/dictionaries_old/60extra_redefine/result/extra/00-base.yml index 83dfcc6c1..8b59e0c07 100644 --- a/tests/dictionaries_old/60extra_redefine/result/extra/00-base.yml +++ b/tests/dictionaries_old/60extra_redefine/result/extra/00-base.yml @@ -26,4 +26,4 @@ ejabberd: choices: - pre - post -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/60extra_redefine/result/extra/01-redefine.yml b/tests/dictionaries_old/60extra_redefine/result/extra/01-redefine.yml index 27c322342..1944e2fcb 100644 --- a/tests/dictionaries_old/60extra_redefine/result/extra/01-redefine.yml +++ b/tests/dictionaries_old/60extra_redefine/result/extra/01-redefine.yml @@ -2,4 +2,4 @@ ejabberd: description: redefine: true hidden: true -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/60extra_redefine/result/rougail/00-base.yml b/tests/dictionaries_old/60extra_redefine/result/rougail/00-base.yml index 1a857b0d1..21111e913 100644 --- a/tests/dictionaries_old/60extra_redefine/result/rougail/00-base.yml +++ b/tests/dictionaries_old/60extra_redefine/result/rougail/00-base.yml @@ -10,4 +10,4 @@ general: description: No change hidden: true default: non -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/60extra_variable_name_extra/result/extra/00-base.yml b/tests/dictionaries_old/60extra_variable_name_extra/result/extra/00-base.yml index 15e1c98cd..5b62b1aee 100644 --- a/tests/dictionaries_old/60extra_variable_name_extra/result/extra/00-base.yml +++ b/tests/dictionaries_old/60extra_variable_name_extra/result/extra/00-base.yml @@ -1,3 +1,3 @@ extra: mandatory: false -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/60extra_variable_name_extra/result/rougail/00-base.yml b/tests/dictionaries_old/60extra_variable_name_extra/result/rougail/00-base.yml index 1a857b0d1..21111e913 100644 --- a/tests/dictionaries_old/60extra_variable_name_extra/result/rougail/00-base.yml +++ b/tests/dictionaries_old/60extra_variable_name_extra/result/rougail/00-base.yml @@ -10,4 +10,4 @@ general: description: No change hidden: true default: non -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/60familyaction/result/extra/00-base.yml b/tests/dictionaries_old/60familyaction/result/extra/00-base.yml index 2ccc3ff50..323643d47 100644 --- a/tests/dictionaries_old/60familyaction/result/extra/00-base.yml +++ b/tests/dictionaries_old/60familyaction/result/extra/00-base.yml @@ -3,4 +3,4 @@ test: type: number description: délai en minutes avant lancement default: 0 -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/60familyaction/result/rougail/00-base.yml b/tests/dictionaries_old/60familyaction/result/rougail/00-base.yml index 1085cc1cc..efac7c360 100644 --- a/tests/dictionaries_old/60familyaction/result/rougail/00-base.yml +++ b/tests/dictionaries_old/60familyaction/result/rougail/00-base.yml @@ -5,4 +5,4 @@ general: description: No change hidden: true default: non -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/60familyaction_mandatory/result/extra/00-base.yml b/tests/dictionaries_old/60familyaction_mandatory/result/extra/00-base.yml index 21c871450..eb56b1414 100644 --- a/tests/dictionaries_old/60familyaction_mandatory/result/extra/00-base.yml +++ b/tests/dictionaries_old/60familyaction_mandatory/result/extra/00-base.yml @@ -7,4 +7,4 @@ test: type: number description: day avant lancement mandatory: true -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/60familyaction_mandatory/result/rougail/00-base.yml b/tests/dictionaries_old/60familyaction_mandatory/result/rougail/00-base.yml index 1085cc1cc..efac7c360 100644 --- a/tests/dictionaries_old/60familyaction_mandatory/result/rougail/00-base.yml +++ b/tests/dictionaries_old/60familyaction_mandatory/result/rougail/00-base.yml @@ -5,4 +5,4 @@ general: description: No change hidden: true default: non -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/61extra_auto_freeze/result/extra/00-base.yml b/tests/dictionaries_old/61extra_auto_freeze/result/extra/00-base.yml index ad6bfb8b4..6ff748500 100644 --- a/tests/dictionaries_old/61extra_auto_freeze/result/extra/00-base.yml +++ b/tests/dictionaries_old/61extra_auto_freeze/result/extra/00-base.yml @@ -2,4 +2,4 @@ ejabberd: mode: type: string default: pre -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/61extra_auto_freeze/result/rougail/00-base.yml b/tests/dictionaries_old/61extra_auto_freeze/result/rougail/00-base.yml index 2bc290d44..706a7cde0 100644 --- a/tests/dictionaries_old/61extra_auto_freeze/result/rougail/00-base.yml +++ b/tests/dictionaries_old/61extra_auto_freeze/result/rougail/00-base.yml @@ -8,4 +8,4 @@ general: description: No change hidden: true default: non -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/61extra_dyn_extra/result/extra/00-base.yml b/tests/dictionaries_old/61extra_dyn_extra/result/extra/00-base.yml index beefdafae..0a3ed64e0 100644 --- a/tests/dictionaries_old/61extra_dyn_extra/result/extra/00-base.yml +++ b/tests/dictionaries_old/61extra_dyn_extra/result/extra/00-base.yml @@ -8,8 +8,11 @@ general: - a ejabberd: type: dynamic - variable: extra.general.varname mode: type: string mandatory: false -version: '1.0' + dynamic: + type: variable + variable: extra.general.varname + propertyerror: false +version: '1.1' diff --git a/tests/dictionaries_old/61extra_dyn_extra/result/rougail/00-base.yml b/tests/dictionaries_old/61extra_dyn_extra/result/rougail/00-base.yml index 2926dc5df..f7fbd8cd7 100644 --- a/tests/dictionaries_old/61extra_dyn_extra/result/rougail/00-base.yml +++ b/tests/dictionaries_old/61extra_dyn_extra/result/rougail/00-base.yml @@ -6,4 +6,4 @@ general: multi: true default: - a -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/70container_files/result/rougail/00-base.yml b/tests/dictionaries_old/70container_files/result/rougail/00-base.yml index c3e916c03..fb536cdb0 100644 --- a/tests/dictionaries_old/70container_files/result/rougail/00-base.yml +++ b/tests/dictionaries_old/70container_files/result/rougail/00-base.yml @@ -5,4 +5,4 @@ general: description: No change hidden: true default: oui -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/70container_files/result/services/00-base.yml b/tests/dictionaries_old/70container_files/result/services/00-base.yml index 5e5dcb3e3..35695216c 100644 --- a/tests/dictionaries_old/70container_files/result/services/00-base.yml +++ b/tests/dictionaries_old/70container_files/result/services/00-base.yml @@ -2,4 +2,4 @@ test.service: files: /etc/mailname: {} /rougail.conf: {} -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/70container_files_symlink_multi/result/rougail/00-base.yml b/tests/dictionaries_old/70container_files_symlink_multi/result/rougail/00-base.yml index c49cf0f1b..06c5b519c 100644 --- a/tests/dictionaries_old/70container_files_symlink_multi/result/rougail/00-base.yml +++ b/tests/dictionaries_old/70container_files_symlink_multi/result/rougail/00-base.yml @@ -10,4 +10,4 @@ file_name2: default: - /etc/mailname3 - /etc/mailname4 -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/70container_files_symlink_multi/result/services/00-base.yml b/tests/dictionaries_old/70container_files_symlink_multi/result/services/00-base.yml index 7da3c0b5d..51162b2c6 100644 --- a/tests/dictionaries_old/70container_files_symlink_multi/result/services/00-base.yml +++ b/tests/dictionaries_old/70container_files_symlink_multi/result/services/00-base.yml @@ -7,4 +7,4 @@ test.service: source: mailname2 engine: jinja type: variable -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/70container_files_symlink_multi_variable/result/rougail/00-base.yml b/tests/dictionaries_old/70container_files_symlink_multi_variable/result/rougail/00-base.yml index aa8529a0f..905a345d4 100644 --- a/tests/dictionaries_old/70container_files_symlink_multi_variable/result/rougail/00-base.yml +++ b/tests/dictionaries_old/70container_files_symlink_multi_variable/result/rougail/00-base.yml @@ -16,4 +16,4 @@ var: default: - mailname - mailname2 -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/70container_files_symlink_multi_variable/result/services/00-base.yml b/tests/dictionaries_old/70container_files_symlink_multi_variable/result/services/00-base.yml index 0e03e2738..15411aa05 100644 --- a/tests/dictionaries_old/70container_files_symlink_multi_variable/result/services/00-base.yml +++ b/tests/dictionaries_old/70container_files_symlink_multi_variable/result/services/00-base.yml @@ -9,4 +9,4 @@ test.service: variable: rougail.var engine: jinja type: variable -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/70container_files_symlink_variable/result/rougail/00-base.yml b/tests/dictionaries_old/70container_files_symlink_variable/result/rougail/00-base.yml index 4713f9927..856bceb18 100644 --- a/tests/dictionaries_old/70container_files_symlink_variable/result/rougail/00-base.yml +++ b/tests/dictionaries_old/70container_files_symlink_variable/result/rougail/00-base.yml @@ -4,4 +4,4 @@ file_name: var: type: string default: mailname -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/70container_files_symlink_variable/result/services/00-base.yml b/tests/dictionaries_old/70container_files_symlink_variable/result/services/00-base.yml index e45aadb6a..193ecce0f 100644 --- a/tests/dictionaries_old/70container_files_symlink_variable/result/services/00-base.yml +++ b/tests/dictionaries_old/70container_files_symlink_variable/result/services/00-base.yml @@ -4,4 +4,4 @@ test.service: source: mailname variable: rougail.var type: variable -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/70container_files_twice/result/rougail/00-base.yml b/tests/dictionaries_old/70container_files_twice/result/rougail/00-base.yml index c3e916c03..fb536cdb0 100644 --- a/tests/dictionaries_old/70container_files_twice/result/rougail/00-base.yml +++ b/tests/dictionaries_old/70container_files_twice/result/rougail/00-base.yml @@ -5,4 +5,4 @@ general: description: No change hidden: true default: oui -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/70container_files_twice/result/services/00-base.yml b/tests/dictionaries_old/70container_files_twice/result/services/00-base.yml index d92ae559b..27a24799b 100644 --- a/tests/dictionaries_old/70container_files_twice/result/services/00-base.yml +++ b/tests/dictionaries_old/70container_files_twice/result/services/00-base.yml @@ -3,4 +3,4 @@ test.service: /etc/mailname: {} /etc/eole/mailname: {} /rougail.conf: {} -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/70container_filesmulti/result/rougail/00-base.yml b/tests/dictionaries_old/70container_filesmulti/result/rougail/00-base.yml index c3e916c03..fb536cdb0 100644 --- a/tests/dictionaries_old/70container_filesmulti/result/rougail/00-base.yml +++ b/tests/dictionaries_old/70container_filesmulti/result/rougail/00-base.yml @@ -5,4 +5,4 @@ general: description: No change hidden: true default: oui -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/70container_filesmulti/result/services/00-base.yml b/tests/dictionaries_old/70container_filesmulti/result/services/00-base.yml index b07c25679..06e6a12e2 100644 --- a/tests/dictionaries_old/70container_filesmulti/result/services/00-base.yml +++ b/tests/dictionaries_old/70container_filesmulti/result/services/00-base.yml @@ -2,4 +2,4 @@ test.service: files: /etc/mailname: {} /etc/mailname2: {} -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/70container_filesredefine/result/rougail/00-base.yml b/tests/dictionaries_old/70container_filesredefine/result/rougail/00-base.yml index c3e916c03..fb536cdb0 100644 --- a/tests/dictionaries_old/70container_filesredefine/result/rougail/00-base.yml +++ b/tests/dictionaries_old/70container_filesredefine/result/rougail/00-base.yml @@ -5,4 +5,4 @@ general: description: No change hidden: true default: oui -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/70container_filesredefine/result/services/00-base.yml b/tests/dictionaries_old/70container_filesredefine/result/services/00-base.yml index e25233253..39c1202b2 100644 --- a/tests/dictionaries_old/70container_filesredefine/result/services/00-base.yml +++ b/tests/dictionaries_old/70container_filesredefine/result/services/00-base.yml @@ -1,4 +1,4 @@ test.service: files: /etc/mailname: {} -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/70container_filesredefine/result/services/01-base.yml b/tests/dictionaries_old/70container_filesredefine/result/services/01-base.yml index db85e7926..7b2f9d665 100644 --- a/tests/dictionaries_old/70container_filesredefine/result/services/01-base.yml +++ b/tests/dictionaries_old/70container_filesredefine/result/services/01-base.yml @@ -3,4 +3,4 @@ test.service: /etc/mailname: source: mailname.new redefine: true -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/70container_new/result/rougail/00-base.yml b/tests/dictionaries_old/70container_new/result/rougail/00-base.yml index c3e916c03..fb536cdb0 100644 --- a/tests/dictionaries_old/70container_new/result/rougail/00-base.yml +++ b/tests/dictionaries_old/70container_new/result/rougail/00-base.yml @@ -5,4 +5,4 @@ general: description: No change hidden: true default: oui -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/70container_new/result/services/00-base.yml b/tests/dictionaries_old/70container_new/result/services/00-base.yml index 6475a5cf5..72456f5ae 100644 --- a/tests/dictionaries_old/70container_new/result/services/00-base.yml +++ b/tests/dictionaries_old/70container_new/result/services/00-base.yml @@ -1,2 +1,2 @@ test.service: {} -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/70container_newnocont/result/rougail/00-base.yml b/tests/dictionaries_old/70container_newnocont/result/rougail/00-base.yml index 1085cc1cc..efac7c360 100644 --- a/tests/dictionaries_old/70container_newnocont/result/rougail/00-base.yml +++ b/tests/dictionaries_old/70container_newnocont/result/rougail/00-base.yml @@ -5,4 +5,4 @@ general: description: No change hidden: true default: non -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/70container_newnocont/result/services/00-base.yml b/tests/dictionaries_old/70container_newnocont/result/services/00-base.yml index 6475a5cf5..72456f5ae 100644 --- a/tests/dictionaries_old/70container_newnocont/result/services/00-base.yml +++ b/tests/dictionaries_old/70container_newnocont/result/services/00-base.yml @@ -1,2 +1,2 @@ test.service: {} -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/70container_newwithip/result/rougail/00-base.yml b/tests/dictionaries_old/70container_newwithip/result/rougail/00-base.yml index 3cad4c289..fae21c256 100644 --- a/tests/dictionaries_old/70container_newwithip/result/rougail/00-base.yml +++ b/tests/dictionaries_old/70container_newwithip/result/rougail/00-base.yml @@ -9,4 +9,4 @@ general: type: ip description: No change mandatory: false -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/70container_newwithip/result/services/00-base.yml b/tests/dictionaries_old/70container_newwithip/result/services/00-base.yml index 6475a5cf5..72456f5ae 100644 --- a/tests/dictionaries_old/70container_newwithip/result/services/00-base.yml +++ b/tests/dictionaries_old/70container_newwithip/result/services/00-base.yml @@ -1,2 +1,2 @@ test.service: {} -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/70container_save/result/rougail/00-base.yml b/tests/dictionaries_old/70container_save/result/rougail/00-base.yml index c3e916c03..fb536cdb0 100644 --- a/tests/dictionaries_old/70container_save/result/rougail/00-base.yml +++ b/tests/dictionaries_old/70container_save/result/rougail/00-base.yml @@ -5,4 +5,4 @@ general: description: No change hidden: true default: oui -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/70service_base/result/rougail/00-base.yml b/tests/dictionaries_old/70service_base/result/rougail/00-base.yml index c3e916c03..fb536cdb0 100644 --- a/tests/dictionaries_old/70service_base/result/rougail/00-base.yml +++ b/tests/dictionaries_old/70service_base/result/rougail/00-base.yml @@ -5,4 +5,4 @@ general: description: No change hidden: true default: oui -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/70service_base/result/services/00-base.yml b/tests/dictionaries_old/70service_base/result/services/00-base.yml index 7802be823..5e611100d 100644 --- a/tests/dictionaries_old/70service_base/result/services/00-base.yml +++ b/tests/dictionaries_old/70service_base/result/services/00-base.yml @@ -1,2 +1,2 @@ testsrv.service: {} -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/70service_disabled/result/rougail/00-base.yml b/tests/dictionaries_old/70service_disabled/result/rougail/00-base.yml index a0de4b9e8..da348e6ff 100644 --- a/tests/dictionaries_old/70service_disabled/result/rougail/00-base.yml +++ b/tests/dictionaries_old/70service_disabled/result/rougail/00-base.yml @@ -1,3 +1,3 @@ condition: default: 'no' -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/70service_disabled/result/services/00-base.yml b/tests/dictionaries_old/70service_disabled/result/services/00-base.yml index 6475a5cf5..72456f5ae 100644 --- a/tests/dictionaries_old/70service_disabled/result/services/00-base.yml +++ b/tests/dictionaries_old/70service_disabled/result/services/00-base.yml @@ -1,2 +1,2 @@ test.service: {} -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/70service_disabled_undisable/result/rougail/00-base.yml b/tests/dictionaries_old/70service_disabled_undisable/result/rougail/00-base.yml index a0de4b9e8..da348e6ff 100644 --- a/tests/dictionaries_old/70service_disabled_undisable/result/rougail/00-base.yml +++ b/tests/dictionaries_old/70service_disabled_undisable/result/rougail/00-base.yml @@ -1,3 +1,3 @@ condition: default: 'no' -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/70service_disabled_undisable/result/services/00-base.yml b/tests/dictionaries_old/70service_disabled_undisable/result/services/00-base.yml index 6475a5cf5..72456f5ae 100644 --- a/tests/dictionaries_old/70service_disabled_undisable/result/services/00-base.yml +++ b/tests/dictionaries_old/70service_disabled_undisable/result/services/00-base.yml @@ -1,2 +1,2 @@ test.service: {} -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/70service_engine/result/rougail/00-base.yml b/tests/dictionaries_old/70service_engine/result/rougail/00-base.yml index c3e916c03..fb536cdb0 100644 --- a/tests/dictionaries_old/70service_engine/result/rougail/00-base.yml +++ b/tests/dictionaries_old/70service_engine/result/rougail/00-base.yml @@ -5,4 +5,4 @@ general: description: No change hidden: true default: oui -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/70service_engine/result/services/00-base.yml b/tests/dictionaries_old/70service_engine/result/services/00-base.yml index 7802be823..5e611100d 100644 --- a/tests/dictionaries_old/70service_engine/result/services/00-base.yml +++ b/tests/dictionaries_old/70service_engine/result/services/00-base.yml @@ -1,2 +1,2 @@ testsrv.service: {} -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/70service_engine_dash/result/rougail/00-base.yml b/tests/dictionaries_old/70service_engine_dash/result/rougail/00-base.yml index c3e916c03..fb536cdb0 100644 --- a/tests/dictionaries_old/70service_engine_dash/result/rougail/00-base.yml +++ b/tests/dictionaries_old/70service_engine_dash/result/rougail/00-base.yml @@ -5,4 +5,4 @@ general: description: No change hidden: true default: oui -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/70service_engine_dash/result/services/00-base.yml b/tests/dictionaries_old/70service_engine_dash/result/services/00-base.yml index 903c5dd5d..bafe02e00 100644 --- a/tests/dictionaries_old/70service_engine_dash/result/services/00-base.yml +++ b/tests/dictionaries_old/70service_engine_dash/result/services/00-base.yml @@ -1,2 +1,2 @@ test-srv.service: {} -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/70service_mount/result/rougail/00-base.yml b/tests/dictionaries_old/70service_mount/result/rougail/00-base.yml index c3e916c03..fb536cdb0 100644 --- a/tests/dictionaries_old/70service_mount/result/rougail/00-base.yml +++ b/tests/dictionaries_old/70service_mount/result/rougail/00-base.yml @@ -5,4 +5,4 @@ general: description: No change hidden: true default: oui -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/70service_mount/result/services/00-base.yml b/tests/dictionaries_old/70service_mount/result/services/00-base.yml index ff7b1f010..7ecf7ed8a 100644 --- a/tests/dictionaries_old/70service_mount/result/services/00-base.yml +++ b/tests/dictionaries_old/70service_mount/result/services/00-base.yml @@ -1,2 +1,2 @@ testsrv.mount: {} -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/70service_not_managed/result/rougail/00-base.yml b/tests/dictionaries_old/70service_not_managed/result/rougail/00-base.yml index 0a95c96ec..372eca0dc 100644 --- a/tests/dictionaries_old/70service_not_managed/result/rougail/00-base.yml +++ b/tests/dictionaries_old/70service_not_managed/result/rougail/00-base.yml @@ -1,4 +1,4 @@ var: type: string default: mailname -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/70service_not_managed/result/services/00-base.yml b/tests/dictionaries_old/70service_not_managed/result/services/00-base.yml index 3fb008396..a44dea4bb 100644 --- a/tests/dictionaries_old/70service_not_managed/result/services/00-base.yml +++ b/tests/dictionaries_old/70service_not_managed/result/services/00-base.yml @@ -1,4 +1,4 @@ test.service: files: /tmp/test: {} -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/70service_servicelist/result/rougail/00-base.yml b/tests/dictionaries_old/70service_servicelist/result/rougail/00-base.yml index a0de4b9e8..da348e6ff 100644 --- a/tests/dictionaries_old/70service_servicelist/result/rougail/00-base.yml +++ b/tests/dictionaries_old/70service_servicelist/result/rougail/00-base.yml @@ -1,3 +1,3 @@ condition: default: 'no' -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/70service_servicelist/result/services/00-base.yml b/tests/dictionaries_old/70service_servicelist/result/services/00-base.yml index 94068b4b7..9cc857dde 100644 --- a/tests/dictionaries_old/70service_servicelist/result/services/00-base.yml +++ b/tests/dictionaries_old/70service_servicelist/result/services/00-base.yml @@ -1,5 +1,5 @@ test.service: disabled: type: jinja - jinja: '{% if rougail.condition == "yes" %}true{% else %}false{% endif %}' -version: '1.0' + jinja: '{% if rougail.condition == "yes" %}disabled{% endif %}' +version: '1.1' diff --git a/tests/dictionaries_old/70service_servicelist_disabled_if_in/result/rougail/00-base.yml b/tests/dictionaries_old/70service_servicelist_disabled_if_in/result/rougail/00-base.yml index 65d6747ac..97e468f16 100644 --- a/tests/dictionaries_old/70service_servicelist_disabled_if_in/result/rougail/00-base.yml +++ b/tests/dictionaries_old/70service_servicelist_disabled_if_in/result/rougail/00-base.yml @@ -4,5 +4,5 @@ condition2: default: 'no' disabled: type: jinja - jinja: '{% if rougail.condition1 == "no" %}true{% else %}false{% endif %}' -version: '1.0' + jinja: '{% if rougail.condition1 == "no" %}disabled{% endif %}' +version: '1.1' diff --git a/tests/dictionaries_old/70service_servicelist_disabled_if_in/result/services/00-base.yml b/tests/dictionaries_old/70service_servicelist_disabled_if_in/result/services/00-base.yml index bfaf86e99..3d79e0257 100644 --- a/tests/dictionaries_old/70service_servicelist_disabled_if_in/result/services/00-base.yml +++ b/tests/dictionaries_old/70service_servicelist_disabled_if_in/result/services/00-base.yml @@ -1,5 +1,5 @@ test.service: disabled: type: jinja - jinja: '{% if rougail.condition2 == "yes" %}true{% else %}false{% endif %}' -version: '1.0' + jinja: '{% if rougail.condition2 == "yes" %}disabled{% endif %}' +version: '1.1' diff --git a/tests/dictionaries_old/70service_servicelist_extra/result/extra/00-base.yml b/tests/dictionaries_old/70service_servicelist_extra/result/extra/00-base.yml index a0de4b9e8..da348e6ff 100644 --- a/tests/dictionaries_old/70service_servicelist_extra/result/extra/00-base.yml +++ b/tests/dictionaries_old/70service_servicelist_extra/result/extra/00-base.yml @@ -1,3 +1,3 @@ condition: default: 'no' -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/70service_servicelist_extra/result/services/00-base.yml b/tests/dictionaries_old/70service_servicelist_extra/result/services/00-base.yml index 6475a5cf5..72456f5ae 100644 --- a/tests/dictionaries_old/70service_servicelist_extra/result/services/00-base.yml +++ b/tests/dictionaries_old/70service_servicelist_extra/result/services/00-base.yml @@ -1,2 +1,2 @@ test.service: {} -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/70service_servicelist_file/result/rougail/00-base.yml b/tests/dictionaries_old/70service_servicelist_file/result/rougail/00-base.yml index 1feb78528..e3327d674 100644 --- a/tests/dictionaries_old/70service_servicelist_file/result/rougail/00-base.yml +++ b/tests/dictionaries_old/70service_servicelist_file/result/rougail/00-base.yml @@ -4,4 +4,4 @@ nut_monitor_host: type: ip mandatory: true default: 192.168.0.1 -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/70service_servicelist_file/result/services/00-base.yml b/tests/dictionaries_old/70service_servicelist_file/result/services/00-base.yml index a3d1d3f1f..c488e87de 100644 --- a/tests/dictionaries_old/70service_servicelist_file/result/services/00-base.yml +++ b/tests/dictionaries_old/70service_servicelist_file/result/services/00-base.yml @@ -3,5 +3,5 @@ test.service: /etc/file: {} disabled: type: jinja - jinja: '{% if rougail.condition == "no" %}true{% else %}false{% endif %}' -version: '1.0' + jinja: '{% if rougail.condition == "no" %}disabled{% endif %}' +version: '1.1' diff --git a/tests/dictionaries_old/70service_servicelist_ip/result/rougail/00-base.yml b/tests/dictionaries_old/70service_servicelist_ip/result/rougail/00-base.yml index 1feb78528..e3327d674 100644 --- a/tests/dictionaries_old/70service_servicelist_ip/result/rougail/00-base.yml +++ b/tests/dictionaries_old/70service_servicelist_ip/result/rougail/00-base.yml @@ -4,4 +4,4 @@ nut_monitor_host: type: ip mandatory: true default: 192.168.0.1 -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/70service_servicelist_ip/result/services/00-base.yml b/tests/dictionaries_old/70service_servicelist_ip/result/services/00-base.yml index 840d56d74..43d8ff131 100644 --- a/tests/dictionaries_old/70service_servicelist_ip/result/services/00-base.yml +++ b/tests/dictionaries_old/70service_servicelist_ip/result/services/00-base.yml @@ -3,5 +3,5 @@ test.service: rougail.nut_monitor_host: {} disabled: type: jinja - jinja: '{% if rougail.condition == "no" %}true{% else %}false{% endif %}' -version: '1.0' + jinja: '{% if rougail.condition == "no" %}disabled{% endif %}' +version: '1.1' diff --git a/tests/dictionaries_old/70service_servicelist_not_managed/result/rougail/00-base.yml b/tests/dictionaries_old/70service_servicelist_not_managed/result/rougail/00-base.yml index a0de4b9e8..da348e6ff 100644 --- a/tests/dictionaries_old/70service_servicelist_not_managed/result/rougail/00-base.yml +++ b/tests/dictionaries_old/70service_servicelist_not_managed/result/rougail/00-base.yml @@ -1,3 +1,3 @@ condition: default: 'no' -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/70service_servicelist_not_managed/result/services/00-base.yml b/tests/dictionaries_old/70service_servicelist_not_managed/result/services/00-base.yml index 94068b4b7..9cc857dde 100644 --- a/tests/dictionaries_old/70service_servicelist_not_managed/result/services/00-base.yml +++ b/tests/dictionaries_old/70service_servicelist_not_managed/result/services/00-base.yml @@ -1,5 +1,5 @@ test.service: disabled: type: jinja - jinja: '{% if rougail.condition == "yes" %}true{% else %}false{% endif %}' -version: '1.0' + jinja: '{% if rougail.condition == "yes" %}disabled{% endif %}' +version: '1.1' diff --git a/tests/dictionaries_old/70service_target/result/rougail/00-base.yml b/tests/dictionaries_old/70service_target/result/rougail/00-base.yml index c3e916c03..fb536cdb0 100644 --- a/tests/dictionaries_old/70service_target/result/rougail/00-base.yml +++ b/tests/dictionaries_old/70service_target/result/rougail/00-base.yml @@ -5,4 +5,4 @@ general: description: No change hidden: true default: oui -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/70service_target/result/services/00-base.yml b/tests/dictionaries_old/70service_target/result/services/00-base.yml index 7802be823..5e611100d 100644 --- a/tests/dictionaries_old/70service_target/result/services/00-base.yml +++ b/tests/dictionaries_old/70service_target/result/services/00-base.yml @@ -1,2 +1,2 @@ testsrv.service: {} -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/70service_target_engine/result/rougail/00-base.yml b/tests/dictionaries_old/70service_target_engine/result/rougail/00-base.yml index c3e916c03..fb536cdb0 100644 --- a/tests/dictionaries_old/70service_target_engine/result/rougail/00-base.yml +++ b/tests/dictionaries_old/70service_target_engine/result/rougail/00-base.yml @@ -5,4 +5,4 @@ general: description: No change hidden: true default: oui -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/70service_target_engine/result/services/00-base.yml b/tests/dictionaries_old/70service_target_engine/result/services/00-base.yml index 7802be823..5e611100d 100644 --- a/tests/dictionaries_old/70service_target_engine/result/services/00-base.yml +++ b/tests/dictionaries_old/70service_target_engine/result/services/00-base.yml @@ -1,2 +1,2 @@ testsrv.service: {} -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/70service_timer/result/services/00-base.yml b/tests/dictionaries_old/70service_timer/result/services/00-base.yml index 84e14c13e..10b058f0b 100644 --- a/tests/dictionaries_old/70service_timer/result/services/00-base.yml +++ b/tests/dictionaries_old/70service_timer/result/services/00-base.yml @@ -1,3 +1,3 @@ testsrv.service: {} testsrv.timer: {} -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/70services_ip/result/rougail/00-base.yml b/tests/dictionaries_old/70services_ip/result/rougail/00-base.yml index 3db77153f..913c1b939 100644 --- a/tests/dictionaries_old/70services_ip/result/rougail/00-base.yml +++ b/tests/dictionaries_old/70services_ip/result/rougail/00-base.yml @@ -2,4 +2,4 @@ nut_monitor_host: type: ip mandatory: true default: 192.168.0.1 -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/70services_ip/result/services/00-base.yml b/tests/dictionaries_old/70services_ip/result/services/00-base.yml index 8637277cc..30d492252 100644 --- a/tests/dictionaries_old/70services_ip/result/services/00-base.yml +++ b/tests/dictionaries_old/70services_ip/result/services/00-base.yml @@ -1,4 +1,4 @@ nut.service: ip: rougail.nut_monitor_host: {} -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/70services_ip_cidr/result/rougail/00-base.yml b/tests/dictionaries_old/70services_ip_cidr/result/rougail/00-base.yml index d749be420..4cabd0d61 100644 --- a/tests/dictionaries_old/70services_ip_cidr/result/rougail/00-base.yml +++ b/tests/dictionaries_old/70services_ip_cidr/result/rougail/00-base.yml @@ -2,4 +2,4 @@ nut_monitor_host: type: network_cidr mandatory: true default: 192.168.0.0/24 -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/70services_ip_cidr/result/services/00-base.yml b/tests/dictionaries_old/70services_ip_cidr/result/services/00-base.yml index 8637277cc..30d492252 100644 --- a/tests/dictionaries_old/70services_ip_cidr/result/services/00-base.yml +++ b/tests/dictionaries_old/70services_ip_cidr/result/services/00-base.yml @@ -1,4 +1,4 @@ nut.service: ip: rougail.nut_monitor_host: {} -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/70services_ip_disabled/result/rougail/00-base.yml b/tests/dictionaries_old/70services_ip_disabled/result/rougail/00-base.yml index 9d469a447..5bc3170b3 100644 --- a/tests/dictionaries_old/70services_ip_disabled/result/rougail/00-base.yml +++ b/tests/dictionaries_old/70services_ip_disabled/result/rougail/00-base.yml @@ -3,4 +3,4 @@ nut_monitor_host: mandatory: true disabled: true default: 192.168.0.1 -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/70services_ip_disabled/result/services/00-base.yml b/tests/dictionaries_old/70services_ip_disabled/result/services/00-base.yml index 8637277cc..30d492252 100644 --- a/tests/dictionaries_old/70services_ip_disabled/result/services/00-base.yml +++ b/tests/dictionaries_old/70services_ip_disabled/result/services/00-base.yml @@ -1,4 +1,4 @@ nut.service: ip: rougail.nut_monitor_host: {} -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/70services_ip_iplist/result/rougail/00-base.yml b/tests/dictionaries_old/70services_ip_iplist/result/rougail/00-base.yml index 42176e0d7..4579ca9b0 100644 --- a/tests/dictionaries_old/70services_ip_iplist/result/rougail/00-base.yml +++ b/tests/dictionaries_old/70services_ip_iplist/result/rougail/00-base.yml @@ -6,5 +6,5 @@ nut_monitor_host: default: 192.168.0.0/24 disabled: type: jinja - jinja: '{% if rougail.condition == "yes" %}true{% else %}false{% endif %}' -version: '1.0' + jinja: '{% if rougail.condition == "yes" %}disabled{% endif %}' +version: '1.1' diff --git a/tests/dictionaries_old/70services_ip_iplist/result/services/00-base.yml b/tests/dictionaries_old/70services_ip_iplist/result/services/00-base.yml index 303073d6d..325dad025 100644 --- a/tests/dictionaries_old/70services_ip_iplist/result/services/00-base.yml +++ b/tests/dictionaries_old/70services_ip_iplist/result/services/00-base.yml @@ -3,5 +3,5 @@ nut.service: rougail.nut_monitor_host: disabled: type: jinja - jinja: '{% if rougail.condition == "yes" %}true{% else %}false{% endif %}' -version: '1.0' + jinja: '{% if rougail.condition == "yes" %}disabled{% endif %}' +version: '1.1' diff --git a/tests/dictionaries_old/70services_ip_iplist2/result/rougail/00-base.yml b/tests/dictionaries_old/70services_ip_iplist2/result/rougail/00-base.yml index c6568346c..34d70d4db 100644 --- a/tests/dictionaries_old/70services_ip_iplist2/result/rougail/00-base.yml +++ b/tests/dictionaries_old/70services_ip_iplist2/result/rougail/00-base.yml @@ -4,4 +4,4 @@ nut_monitor_host: type: network_cidr mandatory: true default: 192.168.0.0/24 -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/70services_ip_iplist2/result/services/00-base.yml b/tests/dictionaries_old/70services_ip_iplist2/result/services/00-base.yml index 303073d6d..325dad025 100644 --- a/tests/dictionaries_old/70services_ip_iplist2/result/services/00-base.yml +++ b/tests/dictionaries_old/70services_ip_iplist2/result/services/00-base.yml @@ -3,5 +3,5 @@ nut.service: rougail.nut_monitor_host: disabled: type: jinja - jinja: '{% if rougail.condition == "yes" %}true{% else %}false{% endif %}' -version: '1.0' + jinja: '{% if rougail.condition == "yes" %}disabled{% endif %}' +version: '1.1' diff --git a/tests/dictionaries_old/70services_ip_leadership/result/rougail/00-base.yml b/tests/dictionaries_old/70services_ip_leadership/result/rougail/00-base.yml index c69430246..b37aad4e1 100644 --- a/tests/dictionaries_old/70services_ip_leadership/result/rougail/00-base.yml +++ b/tests/dictionaries_old/70services_ip_leadership/result/rougail/00-base.yml @@ -13,4 +13,4 @@ general: type: network mandatory: true default: 192.168.1.0 -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/70services_ip_leadership/result/services/00-base.yml b/tests/dictionaries_old/70services_ip_leadership/result/services/00-base.yml index 618555129..f4798d4de 100644 --- a/tests/dictionaries_old/70services_ip_leadership/result/services/00-base.yml +++ b/tests/dictionaries_old/70services_ip_leadership/result/services/00-base.yml @@ -2,4 +2,4 @@ ntp.service: ip: rougail.general.nut_monitor_netmask.nut_monitor_host: netmask: rougail.general.nut_monitor_netmask.nut_monitor_netmask -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/70services_ip_multi/result/rougail/00-base.yml b/tests/dictionaries_old/70services_ip_multi/result/rougail/00-base.yml index 73e7020ab..44b3365e8 100644 --- a/tests/dictionaries_old/70services_ip_multi/result/rougail/00-base.yml +++ b/tests/dictionaries_old/70services_ip_multi/result/rougail/00-base.yml @@ -5,4 +5,4 @@ nut_monitor_host: default: - 192.168.0.1 - 192.168.0.2 -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/70services_ip_multi/result/services/00-base.yml b/tests/dictionaries_old/70services_ip_multi/result/services/00-base.yml index 8637277cc..30d492252 100644 --- a/tests/dictionaries_old/70services_ip_multi/result/services/00-base.yml +++ b/tests/dictionaries_old/70services_ip_multi/result/services/00-base.yml @@ -1,4 +1,4 @@ nut.service: ip: rougail.nut_monitor_host: {} -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/70services_ip_network/result/rougail/00-base.yml b/tests/dictionaries_old/70services_ip_network/result/rougail/00-base.yml index 0ed51457c..b9360e16f 100644 --- a/tests/dictionaries_old/70services_ip_network/result/rougail/00-base.yml +++ b/tests/dictionaries_old/70services_ip_network/result/rougail/00-base.yml @@ -6,4 +6,4 @@ nut_monitor_host: type: network mandatory: true default: 192.168.0.0 -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/70services_ip_network/result/services/00-base.yml b/tests/dictionaries_old/70services_ip_network/result/services/00-base.yml index a57e6c9bb..8167d25d0 100644 --- a/tests/dictionaries_old/70services_ip_network/result/services/00-base.yml +++ b/tests/dictionaries_old/70services_ip_network/result/services/00-base.yml @@ -2,4 +2,4 @@ nut.service: ip: rougail.nut_monitor_host: netmask: rougail.nut_monitor_netmask -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/70services_ip_not_mandatory/result/rougail/00-base.yml b/tests/dictionaries_old/70services_ip_not_mandatory/result/rougail/00-base.yml index 60b9d59c8..a973636d3 100644 --- a/tests/dictionaries_old/70services_ip_not_mandatory/result/rougail/00-base.yml +++ b/tests/dictionaries_old/70services_ip_not_mandatory/result/rougail/00-base.yml @@ -1,4 +1,4 @@ nut_monitor_host: type: ip mandatory: false -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/70services_ip_not_mandatory/result/services/00-base.yml b/tests/dictionaries_old/70services_ip_not_mandatory/result/services/00-base.yml index 8637277cc..30d492252 100644 --- a/tests/dictionaries_old/70services_ip_not_mandatory/result/services/00-base.yml +++ b/tests/dictionaries_old/70services_ip_not_mandatory/result/services/00-base.yml @@ -1,4 +1,4 @@ nut.service: ip: rougail.nut_monitor_host: {} -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/70services_ip_twice/result/rougail/00-base.yml b/tests/dictionaries_old/70services_ip_twice/result/rougail/00-base.yml index d85876234..85441c177 100644 --- a/tests/dictionaries_old/70services_ip_twice/result/rougail/00-base.yml +++ b/tests/dictionaries_old/70services_ip_twice/result/rougail/00-base.yml @@ -6,4 +6,4 @@ nut_monitor_host2: type: ip mandatory: true default: 192.168.0.2 -version: '1.0' +version: '1.1' diff --git a/tests/dictionaries_old/70services_ip_twice/result/services/00-base.yml b/tests/dictionaries_old/70services_ip_twice/result/services/00-base.yml index b7f1d2021..03c993553 100644 --- a/tests/dictionaries_old/70services_ip_twice/result/services/00-base.yml +++ b/tests/dictionaries_old/70services_ip_twice/result/services/00-base.yml @@ -2,4 +2,4 @@ nut.service: ip: rougail.nut_monitor_host: {} rougail.nut_monitor_host2: {} -version: '1.0' +version: '1.1' diff --git a/tests/test_upgrade.py b/tests/test_upgrade.py index 0cdf2d8fc..4a562ce5e 100644 --- a/tests/test_upgrade.py +++ b/tests/test_upgrade.py @@ -103,6 +103,8 @@ def find_files(dirname: str, files: set, ) -> None: for filename in listdir(dirname): + if filename.startswith('.'): + continue abs_dirname = join(dirname, filename) root_file = root + [filename] if isdir(join(dirname, filename)):