diff --git a/src/rougail/convert/collect.py b/src/rougail/convert/collect.py index 155715999..8f7f9f654 100644 --- a/src/rougail/convert/collect.py +++ b/src/rougail/convert/collect.py @@ -44,6 +44,7 @@ class CollectFamily: def family_collect(self) -> None: if self.parameters is None: self.parameters = {} + parameters = self.parameters if self.user_type == "dynamic": # FIXME code here only for support 1.0 dynamic flavor # DictConsistencyError should be place in annotation @@ -51,40 +52,40 @@ class CollectFamily: if "{{ suffix }}" in self.name: self.name = self.name.replace("{{ suffix }}", "{{ identifier }}") self.path = self.path.replace("{{ suffix }}", "{{ identifier }}") - elif "variable" in self.parameters: + elif "variable" in parameters: self.name += "{{ identifier }}" self.path += "{{ identifier }}" elif self.raises and not self.is_type: msg = f'dynamic family name must have "{{{{ identifier }}}}" in his name for "{self.path}"' raise DictConsistencyError(msg, 13, self.sources) if self.version == "1.0": - if self.raises and "variable" not in self.parameters: + if self.raises and "variable" not in parameters: raise DictConsistencyError( f'dynamic family must have "variable" attribute for "{self.path}"', 101, self.sources, ) - if self.raises and "dynamic" in self.parameters: + if self.raises and "dynamic" in parameters: raise DictConsistencyError( 'variable and dynamic cannot be set together in the dynamic family "{self.path}"', 100, self.sources, ) - self.parameters["dynamic"] = { + parameters["dynamic"] = { "type": "variable", - "variable": self.parameters["variable"], + "variable": parameters["variable"], "propertyerror": False, "allow_none": True, } - del self.parameters["variable"] - if "dynamic" not in self.parameters and "variable" in self.parameters: - self.parameters["dynamic"] = { + del parameters["variable"] + if "dynamic" not in parameters and "variable" in parameters: + parameters["dynamic"] = { "type": "variable", - "variable": self.parameters["variable"], + "variable": parameters["variable"], "propertyerror": False, "allow_none": True, } - del self.parameters["variable"] + del parameters["variable"] if self.version != "1.0": warning = f'"variable" attribute in dynamic family "{self.path}" is depreciated in {display_list(self.sources)}' warn( @@ -108,8 +109,8 @@ class CollectFamily: # when an attribute starts with "_", the variable name without this "_" is a variable sub_variables = [ key[1:] - for key in self.parameters - if key.startswith("_") and key[1:] in self.parameters + for key in children + if key.startswith("_") and key[1:] in children ] # and known variables if self.test_exists and self.path in self.objectspace.paths: @@ -157,8 +158,7 @@ class CollectVariable: if self.version == "1.0" or isinstance(obj, dict): if obj is None: # only with self.version to 1.0 - obj = {} - self.parameters = obj + self.parameters = obj = {} self.parse_type_params() self.parse_secret_manager() if self.raises and not self.check_no_extra_keys: @@ -291,19 +291,16 @@ class CollectType: self.set_custom_type( self.objectspace.custom_family_types[self.user_type] ) - if self.user_type is None: - self.object = self.objectspace.family_objects[-1] - else: - self.set_object_user_type_family() break elif self.user_type in self.objectspace.custom_variable_types: self.set_custom_type( self.objectspace.custom_variable_types[self.user_type] ) - if self.user_type is None: - self.object = self.objectspace.variable_objects[0] - else: - self.set_object_user_type_variable() + break + elif self.objectspace.loaded_custom_types and self.user_type in self.objectspace.loaded_custom_types: + self.set_custom_type( + self.objectspace.loaded_custom_types[self.user_type] + ) break self.object = None self.set_object_user_type_family() @@ -531,9 +528,12 @@ class Collect(CollectType, CollectFamily, CollectVariable): and parent_option.types is not None and self.name in parent_option.types.children ): + from_parent = True self.set_custom_type( - parent_option.types.children[self.name], from_parent=True + parent_option.types.children[self.name], from_parent=from_parent ) + else: + from_parent = False self.check_no_extra_keys = False if self.test_exists and path in objectspace.paths: for source in reversed(self.objectspace.paths[path].xmlfiles): @@ -560,14 +560,13 @@ class Collect(CollectType, CollectFamily, CollectVariable): self.variable_collect() self.convert_calculated_parameters() self.exists = self.is_exists() - self.redefine = self.is_redefine() + self.redefine = self.is_redefine(from_parent) def convert_calculated_parameters( self, ): """Parse option attributes and convert calculation""" - obj = self.parameters - for key, value in obj.items(): + for key, value in self.parameters.items(): if self.is_calculation( key, value, @@ -779,7 +778,7 @@ class Collect(CollectType, CollectFamily, CollectVariable): if len(param_typ) == 1: val["type"] = list(param_typ)[0] - def is_redefine(self): + def is_redefine(self, from_parent: bool) -> bool: if ( self.path in self.objectspace.paths and self.option_type == "family" @@ -787,8 +786,8 @@ class Collect(CollectType, CollectFamily, CollectVariable): ): # allow loading family with no attribute loaded return True - if self.types: - return True + if not from_parent and self.types: + return True return self.parameters.pop("redefine", False) or ( self.types and list(self.parameters) in [[], ["default"]] ) diff --git a/src/rougail/convert/convert.py b/src/rougail/convert/convert.py index 266e2c6b3..cd2947a66 100644 --- a/src/rougail/convert/convert.py +++ b/src/rougail/convert/convert.py @@ -294,7 +294,7 @@ class ParserVariable: self, name: str, subpath: str, - obj: dict, + parameters: dict, comment: Optional[str], *, first_variable: bool = False, @@ -305,7 +305,7 @@ class ParserVariable: self, name, subpath, - obj, + parameters, comment, parent_option, is_type=self.loaded_custom_types is not None, @@ -328,10 +328,9 @@ class ParserVariable: custom_type: bool = False, ) -> None: """Parse a family""" - path = option.path redefine = option.redefine exists = option.exists - # if not redefine and not exists and option.user_type in self.custom_family_types: + path = option.path types = option.types if types: self.add_family( @@ -339,12 +338,14 @@ class ParserVariable: custom_type=True, ) if path not in self.paths: - if not self.load_unexist_redefine and exists is None and redefine: - raise Exception( - f'cannot redefine the inexisting family "{path}" in {display_list(option.sources)}' - ) if not self.load_unexist_redefine and exists is True: + # this family must exist + # but it's not the case + # so do nothing return + if not self.load_unexist_redefine and exists is None and redefine: + msg = f'cannot redefine the inexisting family "{path}"' + raise DictConsistencyError(msg, 91, option.sources) self.add_family( option, custom_type=custom_type, @@ -363,19 +364,24 @@ class ParserVariable: force=True, ) force_not_first = types == None + self.set_loaded_custom_types(path, option) + self.parse_children(path, option, types, custom_type, force_not_first) + + + def parse_children(self, path, option, types, custom_type, force_not_first): children = option.children for idx, key in enumerate(self.list_children(option, types)): if key in children: - value = children[key] + parameters = children[key] comment = self.get_comment(key, children) else: - value = {} + parameters = {} comment = None first_variable = not force_not_first and idx == 0 self.family_or_variable( key, path, - value, + parameters, comment, first_variable=first_variable, custom_type=custom_type, @@ -467,8 +473,6 @@ class ParserVariable: self.parents[parent].append(path) self.parents[path] = [] self.families.append(path) - if self.loaded_custom_types != None: - self.loaded_custom_types[path] = option def parse_variable( self, @@ -481,10 +485,10 @@ class ParserVariable: redefine = option.redefine exists = option.exists path = option.path - if option.types: - redefine = True + types = option.types + if types: self.add_variable( - option.types, + types, first_variable=first_variable, custom_type=True, ) @@ -516,6 +520,7 @@ class ParserVariable: self.paths[path].model_copy(update=objects), force=True, ) + self.set_loaded_custom_types(path, option) def add_variable( self, @@ -561,8 +566,23 @@ class ParserVariable: self.leaders.append(path) else: self.followers.append(path) - if self.loaded_custom_types != None: + + def set_loaded_custom_types(self, path, option): + if self.loaded_custom_types is None: + return + if "." not in path: self.loaded_custom_types[path] = option + else: + current = None + root_path, *spath, name = path.split(".") + current = self.loaded_custom_types[root_path] + for subpath in spath: + current = current.children[subpath] + current.children[name] = option + if option.types: + parameters = option.types.parameters.copy() + parameters.update(option.parameters) + option.parameters = parameters def change_namespaces(self, variable): for key, value in variable.items(): @@ -759,12 +779,12 @@ class RougailConvert(ParserVariable): ) -> None: self.version = version self.sources = sources - for name, obj in objects.items(): + for name, parameters in objects.items(): comment = self.get_comment(name, objects) self.family_or_variable( name, path, - obj, + parameters, comment, ) diff --git a/src/rougail/types.py b/src/rougail/types.py index be6ee00ff..b167e718e 100644 --- a/src/rougail/types.py +++ b/src/rougail/types.py @@ -57,26 +57,14 @@ def rougail_type(rougailconfig): ) convert.init() convert.parse_directories() - loaded_custom_types_keys = list(convert.loaded_custom_types) - loaded_custom_types_keys.sort() - for path in loaded_custom_types_keys: - if "." not in path: - continue - current = None - *spath, name = path.split(".") - for subpath in spath: - if not current: - current = convert.loaded_custom_types[subpath] - else: - current = current.children[subpath] - current.children[name] = convert.loaded_custom_types.pop(path) custom_variable_types = {} custom_family_types = {} for typ, data in convert.loaded_custom_types.items(): if data.option_type == "variable": - custom_variable_types[typ] = data + types = custom_variable_types else: - custom_family_types[typ] = data + types = custom_family_types + types[typ] = data return { "variable_objects": convert.variable_objects, "family_objects": convert.family_objects, diff --git a/tests/test_types.py b/tests/test_types.py index a9a20f1c3..15170e7cc 100644 --- a/tests/test_types.py +++ b/tests/test_types.py @@ -18,20 +18,20 @@ def type_variable(test_name, namespace=False): # rougailconfig = RougailConfig.copy() rougailconfig['types'] = [f'tests/types/types/{test_name}'] - if namespace: + if not namespace: rougailconfig['main_namespace'] = None rougailconfig['main_structural_directories'] = [f'tests/types/structures/{ test_name }'] - tiramisu_file = result / "namespace_tiramisu.py" - variables_file = result / "namespace_variables.json" - variables_file_rw = result / "namespace_variables_rw.json" + tiramisu_file = result / "tiramisu.py" + variables_file = result / "variables.json" + variables_file_rw = result / "variables_rw.json" else: rougailconfig['main_namespace'] = 'NS1' rougailconfig['main_structural_directories'] = ['tests/types/structures/main'] rougailconfig['extra_namespaces'] = {'NS2': [f'tests/types/structures/{ test_name }'], } - tiramisu_file = result / "tiramisu.py" - variables_file = result / "variables.json" - variables_file_rw = result / "variables_rw.json" + tiramisu_file = result / "namespace_tiramisu.py" + variables_file = result / "namespace_variables.json" + variables_file_rw = result / "namespace_variables_rw.json" try: rougailconfig['tiramisu_cache'] = str(tmp_file) except: @@ -99,6 +99,14 @@ def test_type_family_redefine_namespace(): type_variable("family_redefine", namespace=True) +def test_type_family_double_redefine2(): + type_variable("family_double_redefine") + + +def test_type_family_redefine_double_namespace(): + type_variable("family_double_redefine", namespace=True) + + def test_type_family_redefine_2(): with raises(DictConsistencyError) as err: type_variable("family_redefine_family_types") @@ -137,6 +145,12 @@ def test_type_root_dynfamily_namespace(): type_variable("family_root_dynfamily", namespace=True) +def test_type_root_dynfamily_error_name(): + with raises(DictConsistencyError) as err: + type_variable("family_root_dynfamily_error_name") + assert err.value.errno == 13 + + def test_type_family_subfamily_add(): type_variable("family_subfamily_add") diff --git a/tests/types/result/error_variable_redefine/namespace_tiramisu.py b/tests/types/result/error_variable_redefine/namespace_tiramisu.py index f0824fda2..b862fa994 100644 --- a/tests/types/result/error_variable_redefine/namespace_tiramisu.py +++ b/tests/types/result/error_variable_redefine/namespace_tiramisu.py @@ -9,5 +9,6 @@ except: ALLOWED_LEADER_PROPERTIES.add("basic") ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") -option_1 = StrOption(name="my_var", doc="My type", default="a value", properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['tests/types/types/error_variable_redefine/00_type.yml', 'tests/types/structures/error_variable_redefine/00_structure.yml'], 'type': 'string'}) -option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1]) +option_3 = StrOption(name="my_var", doc="My type", default="a value", properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['tests/types/types/error_variable_redefine/00_type.yml', 'tests/types/structures/error_variable_redefine/00_structure.yml'], 'type': 'string'}) +optiondescription_2 = OptionDescription(name="ns2", doc="NS2", group_type=groups.namespace, children=[option_3], properties=frozenset({"standard"})) +option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_2]) diff --git a/tests/types/result/error_variable_redefine/namespace_variables.json b/tests/types/result/error_variable_redefine/namespace_variables.json index 9a5fd9c00..4e7d32888 100644 --- a/tests/types/result/error_variable_redefine/namespace_variables.json +++ b/tests/types/result/error_variable_redefine/namespace_variables.json @@ -1,3 +1,3 @@ { - "my_var": "a value" + "ns2.my_var": "a value" } \ No newline at end of file diff --git a/tests/types/result/error_variable_redefine/namespace_variables_rw.json b/tests/types/result/error_variable_redefine/namespace_variables_rw.json index 9a5fd9c00..4e7d32888 100644 --- a/tests/types/result/error_variable_redefine/namespace_variables_rw.json +++ b/tests/types/result/error_variable_redefine/namespace_variables_rw.json @@ -1,3 +1,3 @@ { - "my_var": "a value" + "ns2.my_var": "a value" } \ No newline at end of file diff --git a/tests/types/result/family/namespace_tiramisu.py b/tests/types/result/family/namespace_tiramisu.py index 1596cf908..802c570d0 100644 --- a/tests/types/result/family/namespace_tiramisu.py +++ b/tests/types/result/family/namespace_tiramisu.py @@ -9,6 +9,7 @@ except: ALLOWED_LEADER_PROPERTIES.add("basic") ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") -option_2 = StrOption(name="my_type", doc="My type", default="a value", properties=frozenset({"mandatory", "one_tag", "standard"}), informations={'ymlfiles': ['tests/types/types/family/00_type.yml', 'tests/types/structures/family/00_structure.yml'], 'type': 'string', 'tags': ('one_tag',)}) -optiondescription_1 = OptionDescription(name="my_family", doc="My family type", children=[option_2], properties=frozenset({"standard"}), informations={'ymlfiles': ['tests/types/types/family/00_type.yml', 'tests/types/structures/family/00_structure.yml']}) -option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1]) +option_4 = StrOption(name="my_type", doc="My type", default="a value", properties=frozenset({"mandatory", "one_tag", "standard"}), informations={'ymlfiles': ['tests/types/types/family/00_type.yml', 'tests/types/structures/family/00_structure.yml'], 'type': 'string', 'tags': ('one_tag',)}) +optiondescription_3 = OptionDescription(name="my_family", doc="My family type", children=[option_4], properties=frozenset({"standard"}), informations={'ymlfiles': ['tests/types/types/family/00_type.yml', 'tests/types/structures/family/00_structure.yml']}) +optiondescription_2 = OptionDescription(name="ns2", doc="NS2", group_type=groups.namespace, children=[optiondescription_3], properties=frozenset({"standard"})) +option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_2]) diff --git a/tests/types/result/family/namespace_variables.json b/tests/types/result/family/namespace_variables.json index cc45aa4fc..36946fb4c 100644 --- a/tests/types/result/family/namespace_variables.json +++ b/tests/types/result/family/namespace_variables.json @@ -1,3 +1,3 @@ { - "my_family.my_type": "a value" + "ns2.my_family.my_type": "a value" } \ No newline at end of file diff --git a/tests/types/result/family/namespace_variables_rw.json b/tests/types/result/family/namespace_variables_rw.json index cc45aa4fc..36946fb4c 100644 --- a/tests/types/result/family/namespace_variables_rw.json +++ b/tests/types/result/family/namespace_variables_rw.json @@ -1,3 +1,3 @@ { - "my_family.my_type": "a value" + "ns2.my_family.my_type": "a value" } \ No newline at end of file diff --git a/tests/types/result/family/tiramisu.py b/tests/types/result/family/tiramisu.py index 802c570d0..1596cf908 100644 --- a/tests/types/result/family/tiramisu.py +++ b/tests/types/result/family/tiramisu.py @@ -9,7 +9,6 @@ except: ALLOWED_LEADER_PROPERTIES.add("basic") ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") -option_4 = StrOption(name="my_type", doc="My type", default="a value", properties=frozenset({"mandatory", "one_tag", "standard"}), informations={'ymlfiles': ['tests/types/types/family/00_type.yml', 'tests/types/structures/family/00_structure.yml'], 'type': 'string', 'tags': ('one_tag',)}) -optiondescription_3 = OptionDescription(name="my_family", doc="My family type", children=[option_4], properties=frozenset({"standard"}), informations={'ymlfiles': ['tests/types/types/family/00_type.yml', 'tests/types/structures/family/00_structure.yml']}) -optiondescription_2 = OptionDescription(name="ns2", doc="NS2", group_type=groups.namespace, children=[optiondescription_3], properties=frozenset({"standard"})) -option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_2]) +option_2 = StrOption(name="my_type", doc="My type", default="a value", properties=frozenset({"mandatory", "one_tag", "standard"}), informations={'ymlfiles': ['tests/types/types/family/00_type.yml', 'tests/types/structures/family/00_structure.yml'], 'type': 'string', 'tags': ('one_tag',)}) +optiondescription_1 = OptionDescription(name="my_family", doc="My family type", children=[option_2], properties=frozenset({"standard"}), informations={'ymlfiles': ['tests/types/types/family/00_type.yml', 'tests/types/structures/family/00_structure.yml']}) +option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1]) diff --git a/tests/types/result/family/variables.json b/tests/types/result/family/variables.json index 36946fb4c..cc45aa4fc 100644 --- a/tests/types/result/family/variables.json +++ b/tests/types/result/family/variables.json @@ -1,3 +1,3 @@ { - "ns2.my_family.my_type": "a value" + "my_family.my_type": "a value" } \ No newline at end of file diff --git a/tests/types/result/family/variables_rw.json b/tests/types/result/family/variables_rw.json index 36946fb4c..cc45aa4fc 100644 --- a/tests/types/result/family/variables_rw.json +++ b/tests/types/result/family/variables_rw.json @@ -1,3 +1,3 @@ { - "ns2.my_family.my_type": "a value" + "my_family.my_type": "a value" } \ No newline at end of file diff --git a/tests/types/result/family_double_redefine/namespace_tiramisu.py b/tests/types/result/family_double_redefine/namespace_tiramisu.py new file mode 100644 index 000000000..3428d2578 --- /dev/null +++ b/tests/types/result/family_double_redefine/namespace_tiramisu.py @@ -0,0 +1,17 @@ +from tiramisu import * +from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +from re import compile as re_compile +from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription +try: + groups.namespace +except: + groups.addgroup('namespace') +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("standard") +ALLOWED_LEADER_PROPERTIES.add("advanced") +option_4 = StrOption(name="my_type", doc="My type", default="a value", properties=frozenset({"mandatory", "one_tag", "standard"}), informations={'ymlfiles': ['tests/types/types/family_double_redefine/00_type.yml', 'tests/types/types/family_double_redefine/10_redefine.yml', 'tests/types/structures/family_double_redefine/00_structure.yml'], 'type': 'string', 'tags': ('one_tag',)}) +optiondescription_3 = OptionDescription(name="my_family_1", doc="My family type", children=[option_4], properties=frozenset({"standard"}), informations={'ymlfiles': ['tests/types/types/family_double_redefine/00_type.yml', 'tests/types/types/family_double_redefine/10_redefine.yml', 'tests/types/structures/family_double_redefine/00_structure.yml']}) +option_6 = StrOption(name="my_type", doc="My type ori", default="a value", properties=frozenset({"mandatory", "one_tag", "standard"}), informations={'ymlfiles': ['tests/types/types/family_double_redefine/00_type.yml', 'tests/types/structures/family_double_redefine/00_structure.yml'], 'type': 'string', 'tags': ('one_tag',)}) +optiondescription_5 = OptionDescription(name="my_family_2", doc="My family type ori", children=[option_6], properties=frozenset({"standard"}), informations={'ymlfiles': ['tests/types/types/family_double_redefine/00_type.yml', 'tests/types/structures/family_double_redefine/00_structure.yml']}) +optiondescription_2 = OptionDescription(name="ns2", doc="NS2", group_type=groups.namespace, children=[optiondescription_3, optiondescription_5], properties=frozenset({"standard"})) +option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_2]) diff --git a/tests/types/result/family_double_redefine/namespace_variables.json b/tests/types/result/family_double_redefine/namespace_variables.json new file mode 100644 index 000000000..a5a99750f --- /dev/null +++ b/tests/types/result/family_double_redefine/namespace_variables.json @@ -0,0 +1,4 @@ +{ + "ns2.my_family_1.my_type": "a value", + "ns2.my_family_2.my_type": "a value" +} \ No newline at end of file diff --git a/tests/types/result/family_double_redefine/namespace_variables_rw.json b/tests/types/result/family_double_redefine/namespace_variables_rw.json new file mode 100644 index 000000000..a5a99750f --- /dev/null +++ b/tests/types/result/family_double_redefine/namespace_variables_rw.json @@ -0,0 +1,4 @@ +{ + "ns2.my_family_1.my_type": "a value", + "ns2.my_family_2.my_type": "a value" +} \ No newline at end of file diff --git a/tests/types/result/family_double_redefine/tiramisu.py b/tests/types/result/family_double_redefine/tiramisu.py new file mode 100644 index 000000000..27b36c0dc --- /dev/null +++ b/tests/types/result/family_double_redefine/tiramisu.py @@ -0,0 +1,16 @@ +from tiramisu import * +from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +from re import compile as re_compile +from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription +try: + groups.namespace +except: + groups.addgroup('namespace') +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("standard") +ALLOWED_LEADER_PROPERTIES.add("advanced") +option_2 = StrOption(name="my_type", doc="My type", default="a value", properties=frozenset({"mandatory", "one_tag", "standard"}), informations={'ymlfiles': ['tests/types/types/family_double_redefine/00_type.yml', 'tests/types/types/family_double_redefine/10_redefine.yml', 'tests/types/structures/family_double_redefine/00_structure.yml'], 'type': 'string', 'tags': ('one_tag',)}) +optiondescription_1 = OptionDescription(name="my_family_1", doc="My family type", children=[option_2], properties=frozenset({"standard"}), informations={'ymlfiles': ['tests/types/types/family_double_redefine/00_type.yml', 'tests/types/types/family_double_redefine/10_redefine.yml', 'tests/types/structures/family_double_redefine/00_structure.yml']}) +option_4 = StrOption(name="my_type", doc="My type ori", default="a value", properties=frozenset({"mandatory", "one_tag", "standard"}), informations={'ymlfiles': ['tests/types/types/family_double_redefine/00_type.yml', 'tests/types/structures/family_double_redefine/00_structure.yml'], 'type': 'string', 'tags': ('one_tag',)}) +optiondescription_3 = OptionDescription(name="my_family_2", doc="My family type ori", children=[option_4], properties=frozenset({"standard"}), informations={'ymlfiles': ['tests/types/types/family_double_redefine/00_type.yml', 'tests/types/structures/family_double_redefine/00_structure.yml']}) +option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1, optiondescription_3]) diff --git a/tests/types/result/family_double_redefine/variables.json b/tests/types/result/family_double_redefine/variables.json new file mode 100644 index 000000000..dbdb1890f --- /dev/null +++ b/tests/types/result/family_double_redefine/variables.json @@ -0,0 +1,4 @@ +{ + "my_family_1.my_type": "a value", + "my_family_2.my_type": "a value" +} \ No newline at end of file diff --git a/tests/types/result/family_double_redefine/variables_rw.json b/tests/types/result/family_double_redefine/variables_rw.json new file mode 100644 index 000000000..dbdb1890f --- /dev/null +++ b/tests/types/result/family_double_redefine/variables_rw.json @@ -0,0 +1,4 @@ +{ + "my_family_1.my_type": "a value", + "my_family_2.my_type": "a value" +} \ No newline at end of file diff --git a/tests/types/result/family_dynfamily/namespace_tiramisu.py b/tests/types/result/family_dynfamily/namespace_tiramisu.py index a2c2c6eaa..2fd306605 100644 --- a/tests/types/result/family_dynfamily/namespace_tiramisu.py +++ b/tests/types/result/family_dynfamily/namespace_tiramisu.py @@ -9,19 +9,20 @@ except: ALLOWED_LEADER_PROPERTIES.add("basic") ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") -option_2 = StrOption(name="a_first_variable", doc="a first variable", default="a modified value", properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['tests/types/types/family_dynfamily/00_structure.yml', 'tests/types/structures/family_dynfamily/00_structure.yml'], 'type': 'string'}) -option_4 = StrOption(name="identifier", doc="identifier", multi=True, default=["family"], default_multi="family", properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['tests/types/types/family_dynfamily/00_structure.yml', 'tests/types/structures/family_dynfamily/00_structure.yml'], 'type': 'string'}) -option_5 = StrOption(name="a_second_variable", doc="a second variable", default="a modified value", properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['tests/types/types/family_dynfamily/00_structure.yml', 'tests/types/structures/family_dynfamily/00_structure.yml'], 'type': 'string'}) -optiondescription_3 = OptionDescription(name="a_sub_{{ identifier }}", doc="My sub{{ identifier }}", children=[option_4, option_5], properties=frozenset({"standard"}), informations={'ymlfiles': ['tests/types/types/family_dynfamily/00_structure.yml', 'tests/types/structures/family_dynfamily/00_structure.yml']}) -optiondescription_1 = OptionDescription(name="my_family_1", doc="My family type", children=[option_2, optiondescription_3], properties=frozenset({"standard"}), informations={'ymlfiles': ['tests/types/types/family_dynfamily/00_structure.yml', 'tests/types/structures/family_dynfamily/00_structure.yml']}) -option_7 = StrOption(name="a_first_variable", doc="a first variable", default="a value", properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['tests/types/types/family_dynfamily/00_structure.yml', 'tests/types/structures/family_dynfamily/00_structure.yml'], 'type': 'string'}) -option_9 = StrOption(name="identifier", doc="identifier", multi=True, default=["family"], default_multi="family", properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['tests/types/types/family_dynfamily/00_structure.yml', 'tests/types/structures/family_dynfamily/00_structure.yml'], 'type': 'string'}) -option_10 = StrOption(name="a_second_variable", doc="a second variable", properties=frozenset({"basic", "mandatory"}), informations={'ymlfiles': ['tests/types/types/family_dynfamily/00_structure.yml', 'tests/types/structures/family_dynfamily/00_structure.yml'], 'type': 'string'}) -optiondescription_8 = OptionDescription(name="a_sub_{{ identifier }}", doc="My sub{{ identifier }}", children=[option_9, option_10], properties=frozenset({"basic"}), informations={'ymlfiles': ['tests/types/types/family_dynfamily/00_structure.yml', 'tests/types/structures/family_dynfamily/00_structure.yml']}) -optiondescription_6 = OptionDescription(name="my_family_2", doc="My family type", children=[option_7, optiondescription_8], properties=frozenset({"basic"}), informations={'ymlfiles': ['tests/types/types/family_dynfamily/00_structure.yml', 'tests/types/structures/family_dynfamily/00_structure.yml']}) -option_12 = StrOption(name="a_first_variable", doc="a first variable", default="a value", properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['tests/types/types/family_dynfamily/00_structure.yml', 'tests/types/structures/family_dynfamily/00_structure.yml'], 'type': 'string'}) -option_14 = StrOption(name="identifier", doc="identifier", multi=True, default=["family"], default_multi="family", properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['tests/types/types/family_dynfamily/00_structure.yml', 'tests/types/structures/family_dynfamily/00_structure.yml'], 'type': 'string'}) -option_15 = StrOption(name="a_second_variable", doc="a second variable", default="a modified value 2", properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['tests/types/types/family_dynfamily/00_structure.yml', 'tests/types/structures/family_dynfamily/00_structure.yml'], 'type': 'string'}) -optiondescription_13 = OptionDescription(name="a_sub_{{ identifier }}", doc="My sub{{ identifier }}", children=[option_14, option_15], properties=frozenset({"standard"}), informations={'ymlfiles': ['tests/types/types/family_dynfamily/00_structure.yml', 'tests/types/structures/family_dynfamily/00_structure.yml']}) -optiondescription_11 = OptionDescription(name="my_family_3", doc="My family type", children=[option_12, optiondescription_13], properties=frozenset({"standard"}), informations={'ymlfiles': ['tests/types/types/family_dynfamily/00_structure.yml', 'tests/types/structures/family_dynfamily/00_structure.yml']}) -option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1, optiondescription_6, optiondescription_11]) +option_4 = StrOption(name="a_first_variable", doc="a first variable", default="a modified value", properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['tests/types/types/family_dynfamily/00_structure.yml', 'tests/types/structures/family_dynfamily/00_structure.yml'], 'type': 'string'}) +option_6 = StrOption(name="identifier", doc="identifier", multi=True, default=["family"], default_multi="family", properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['tests/types/types/family_dynfamily/00_structure.yml', 'tests/types/structures/family_dynfamily/00_structure.yml'], 'type': 'string'}) +option_7 = StrOption(name="a_second_variable", doc="a second variable", default="a modified value", properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['tests/types/types/family_dynfamily/00_structure.yml', 'tests/types/structures/family_dynfamily/00_structure.yml'], 'type': 'string'}) +optiondescription_5 = OptionDescription(name="a_sub_{{ identifier }}", doc="My sub{{ identifier }}", children=[option_6, option_7], properties=frozenset({"standard"}), informations={'ymlfiles': ['tests/types/types/family_dynfamily/00_structure.yml', 'tests/types/structures/family_dynfamily/00_structure.yml']}) +optiondescription_3 = OptionDescription(name="my_family_1", doc="My family type", children=[option_4, optiondescription_5], properties=frozenset({"standard"}), informations={'ymlfiles': ['tests/types/types/family_dynfamily/00_structure.yml', 'tests/types/structures/family_dynfamily/00_structure.yml']}) +option_9 = StrOption(name="a_first_variable", doc="a first variable", default="a value", properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['tests/types/types/family_dynfamily/00_structure.yml', 'tests/types/structures/family_dynfamily/00_structure.yml'], 'type': 'string'}) +option_11 = StrOption(name="identifier", doc="identifier", multi=True, default=["family"], default_multi="family", properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['tests/types/types/family_dynfamily/00_structure.yml', 'tests/types/structures/family_dynfamily/00_structure.yml'], 'type': 'string'}) +option_12 = StrOption(name="a_second_variable", doc="a second variable", properties=frozenset({"basic", "mandatory"}), informations={'ymlfiles': ['tests/types/types/family_dynfamily/00_structure.yml', 'tests/types/structures/family_dynfamily/00_structure.yml'], 'type': 'string'}) +optiondescription_10 = OptionDescription(name="a_sub_{{ identifier }}", doc="My sub{{ identifier }}", children=[option_11, option_12], properties=frozenset({"basic"}), informations={'ymlfiles': ['tests/types/types/family_dynfamily/00_structure.yml', 'tests/types/structures/family_dynfamily/00_structure.yml']}) +optiondescription_8 = OptionDescription(name="my_family_2", doc="My family type", children=[option_9, optiondescription_10], properties=frozenset({"basic"}), informations={'ymlfiles': ['tests/types/types/family_dynfamily/00_structure.yml', 'tests/types/structures/family_dynfamily/00_structure.yml']}) +option_14 = StrOption(name="a_first_variable", doc="a first variable", default="a value", properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['tests/types/types/family_dynfamily/00_structure.yml', 'tests/types/structures/family_dynfamily/00_structure.yml'], 'type': 'string'}) +option_16 = StrOption(name="identifier", doc="identifier", multi=True, default=["family"], default_multi="family", properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['tests/types/types/family_dynfamily/00_structure.yml', 'tests/types/structures/family_dynfamily/00_structure.yml'], 'type': 'string'}) +option_17 = StrOption(name="a_second_variable", doc="a second variable", default="a modified value 2", properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['tests/types/types/family_dynfamily/00_structure.yml', 'tests/types/structures/family_dynfamily/00_structure.yml'], 'type': 'string'}) +optiondescription_15 = OptionDescription(name="a_sub_{{ identifier }}", doc="My sub{{ identifier }}", children=[option_16, option_17], properties=frozenset({"standard"}), informations={'ymlfiles': ['tests/types/types/family_dynfamily/00_structure.yml', 'tests/types/structures/family_dynfamily/00_structure.yml']}) +optiondescription_13 = OptionDescription(name="my_family_3", doc="My family type", children=[option_14, optiondescription_15], properties=frozenset({"standard"}), informations={'ymlfiles': ['tests/types/types/family_dynfamily/00_structure.yml', 'tests/types/structures/family_dynfamily/00_structure.yml']}) +optiondescription_2 = OptionDescription(name="ns2", doc="NS2", group_type=groups.namespace, children=[optiondescription_3, optiondescription_8, optiondescription_13], properties=frozenset({"basic"})) +option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_2]) diff --git a/tests/types/result/family_dynfamily/namespace_variables.json b/tests/types/result/family_dynfamily/namespace_variables.json index 6697d1f9d..b04706b97 100644 --- a/tests/types/result/family_dynfamily/namespace_variables.json +++ b/tests/types/result/family_dynfamily/namespace_variables.json @@ -1,17 +1,17 @@ { - "my_family_1.a_first_variable": "a modified value", - "my_family_1.a_sub_{{\u00a0identifier }}.identifier": [ + "ns2.my_family_1.a_first_variable": "a modified value", + "ns2.my_family_1.a_sub_{{\u00a0identifier }}.identifier": [ "family" ], - "my_family_1.a_sub_{{\u00a0identifier }}.a_second_variable": "a modified value", - "my_family_2.a_first_variable": "a value", - "my_family_2.a_sub_{{\u00a0identifier }}.identifier": [ + "ns2.my_family_1.a_sub_{{\u00a0identifier }}.a_second_variable": "a modified value", + "ns2.my_family_2.a_first_variable": "a value", + "ns2.my_family_2.a_sub_{{\u00a0identifier }}.identifier": [ "family" ], - "my_family_2.a_sub_{{\u00a0identifier }}.a_second_variable": null, - "my_family_3.a_first_variable": "a value", - "my_family_3.a_sub_{{\u00a0identifier }}.identifier": [ + "ns2.my_family_2.a_sub_{{\u00a0identifier }}.a_second_variable": null, + "ns2.my_family_3.a_first_variable": "a value", + "ns2.my_family_3.a_sub_{{\u00a0identifier }}.identifier": [ "family" ], - "my_family_3.a_sub_{{\u00a0identifier }}.a_second_variable": "a modified value 2" + "ns2.my_family_3.a_sub_{{\u00a0identifier }}.a_second_variable": "a modified value 2" } \ No newline at end of file diff --git a/tests/types/result/family_dynfamily/namespace_variables_rw.json b/tests/types/result/family_dynfamily/namespace_variables_rw.json index 6697d1f9d..b04706b97 100644 --- a/tests/types/result/family_dynfamily/namespace_variables_rw.json +++ b/tests/types/result/family_dynfamily/namespace_variables_rw.json @@ -1,17 +1,17 @@ { - "my_family_1.a_first_variable": "a modified value", - "my_family_1.a_sub_{{\u00a0identifier }}.identifier": [ + "ns2.my_family_1.a_first_variable": "a modified value", + "ns2.my_family_1.a_sub_{{\u00a0identifier }}.identifier": [ "family" ], - "my_family_1.a_sub_{{\u00a0identifier }}.a_second_variable": "a modified value", - "my_family_2.a_first_variable": "a value", - "my_family_2.a_sub_{{\u00a0identifier }}.identifier": [ + "ns2.my_family_1.a_sub_{{\u00a0identifier }}.a_second_variable": "a modified value", + "ns2.my_family_2.a_first_variable": "a value", + "ns2.my_family_2.a_sub_{{\u00a0identifier }}.identifier": [ "family" ], - "my_family_2.a_sub_{{\u00a0identifier }}.a_second_variable": null, - "my_family_3.a_first_variable": "a value", - "my_family_3.a_sub_{{\u00a0identifier }}.identifier": [ + "ns2.my_family_2.a_sub_{{\u00a0identifier }}.a_second_variable": null, + "ns2.my_family_3.a_first_variable": "a value", + "ns2.my_family_3.a_sub_{{\u00a0identifier }}.identifier": [ "family" ], - "my_family_3.a_sub_{{\u00a0identifier }}.a_second_variable": "a modified value 2" + "ns2.my_family_3.a_sub_{{\u00a0identifier }}.a_second_variable": "a modified value 2" } \ No newline at end of file diff --git a/tests/types/result/family_dynfamily/tiramisu.py b/tests/types/result/family_dynfamily/tiramisu.py index 2fd306605..a2c2c6eaa 100644 --- a/tests/types/result/family_dynfamily/tiramisu.py +++ b/tests/types/result/family_dynfamily/tiramisu.py @@ -9,20 +9,19 @@ except: ALLOWED_LEADER_PROPERTIES.add("basic") ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") -option_4 = StrOption(name="a_first_variable", doc="a first variable", default="a modified value", properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['tests/types/types/family_dynfamily/00_structure.yml', 'tests/types/structures/family_dynfamily/00_structure.yml'], 'type': 'string'}) -option_6 = StrOption(name="identifier", doc="identifier", multi=True, default=["family"], default_multi="family", properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['tests/types/types/family_dynfamily/00_structure.yml', 'tests/types/structures/family_dynfamily/00_structure.yml'], 'type': 'string'}) -option_7 = StrOption(name="a_second_variable", doc="a second variable", default="a modified value", properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['tests/types/types/family_dynfamily/00_structure.yml', 'tests/types/structures/family_dynfamily/00_structure.yml'], 'type': 'string'}) -optiondescription_5 = OptionDescription(name="a_sub_{{ identifier }}", doc="My sub{{ identifier }}", children=[option_6, option_7], properties=frozenset({"standard"}), informations={'ymlfiles': ['tests/types/types/family_dynfamily/00_structure.yml', 'tests/types/structures/family_dynfamily/00_structure.yml']}) -optiondescription_3 = OptionDescription(name="my_family_1", doc="My family type", children=[option_4, optiondescription_5], properties=frozenset({"standard"}), informations={'ymlfiles': ['tests/types/types/family_dynfamily/00_structure.yml', 'tests/types/structures/family_dynfamily/00_structure.yml']}) -option_9 = StrOption(name="a_first_variable", doc="a first variable", default="a value", properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['tests/types/types/family_dynfamily/00_structure.yml', 'tests/types/structures/family_dynfamily/00_structure.yml'], 'type': 'string'}) -option_11 = StrOption(name="identifier", doc="identifier", multi=True, default=["family"], default_multi="family", properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['tests/types/types/family_dynfamily/00_structure.yml', 'tests/types/structures/family_dynfamily/00_structure.yml'], 'type': 'string'}) -option_12 = StrOption(name="a_second_variable", doc="a second variable", properties=frozenset({"basic", "mandatory"}), informations={'ymlfiles': ['tests/types/types/family_dynfamily/00_structure.yml', 'tests/types/structures/family_dynfamily/00_structure.yml'], 'type': 'string'}) -optiondescription_10 = OptionDescription(name="a_sub_{{ identifier }}", doc="My sub{{ identifier }}", children=[option_11, option_12], properties=frozenset({"basic"}), informations={'ymlfiles': ['tests/types/types/family_dynfamily/00_structure.yml', 'tests/types/structures/family_dynfamily/00_structure.yml']}) -optiondescription_8 = OptionDescription(name="my_family_2", doc="My family type", children=[option_9, optiondescription_10], properties=frozenset({"basic"}), informations={'ymlfiles': ['tests/types/types/family_dynfamily/00_structure.yml', 'tests/types/structures/family_dynfamily/00_structure.yml']}) -option_14 = StrOption(name="a_first_variable", doc="a first variable", default="a value", properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['tests/types/types/family_dynfamily/00_structure.yml', 'tests/types/structures/family_dynfamily/00_structure.yml'], 'type': 'string'}) -option_16 = StrOption(name="identifier", doc="identifier", multi=True, default=["family"], default_multi="family", properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['tests/types/types/family_dynfamily/00_structure.yml', 'tests/types/structures/family_dynfamily/00_structure.yml'], 'type': 'string'}) -option_17 = StrOption(name="a_second_variable", doc="a second variable", default="a modified value 2", properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['tests/types/types/family_dynfamily/00_structure.yml', 'tests/types/structures/family_dynfamily/00_structure.yml'], 'type': 'string'}) -optiondescription_15 = OptionDescription(name="a_sub_{{ identifier }}", doc="My sub{{ identifier }}", children=[option_16, option_17], properties=frozenset({"standard"}), informations={'ymlfiles': ['tests/types/types/family_dynfamily/00_structure.yml', 'tests/types/structures/family_dynfamily/00_structure.yml']}) -optiondescription_13 = OptionDescription(name="my_family_3", doc="My family type", children=[option_14, optiondescription_15], properties=frozenset({"standard"}), informations={'ymlfiles': ['tests/types/types/family_dynfamily/00_structure.yml', 'tests/types/structures/family_dynfamily/00_structure.yml']}) -optiondescription_2 = OptionDescription(name="ns2", doc="NS2", group_type=groups.namespace, children=[optiondescription_3, optiondescription_8, optiondescription_13], properties=frozenset({"basic"})) -option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_2]) +option_2 = StrOption(name="a_first_variable", doc="a first variable", default="a modified value", properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['tests/types/types/family_dynfamily/00_structure.yml', 'tests/types/structures/family_dynfamily/00_structure.yml'], 'type': 'string'}) +option_4 = StrOption(name="identifier", doc="identifier", multi=True, default=["family"], default_multi="family", properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['tests/types/types/family_dynfamily/00_structure.yml', 'tests/types/structures/family_dynfamily/00_structure.yml'], 'type': 'string'}) +option_5 = StrOption(name="a_second_variable", doc="a second variable", default="a modified value", properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['tests/types/types/family_dynfamily/00_structure.yml', 'tests/types/structures/family_dynfamily/00_structure.yml'], 'type': 'string'}) +optiondescription_3 = OptionDescription(name="a_sub_{{ identifier }}", doc="My sub{{ identifier }}", children=[option_4, option_5], properties=frozenset({"standard"}), informations={'ymlfiles': ['tests/types/types/family_dynfamily/00_structure.yml', 'tests/types/structures/family_dynfamily/00_structure.yml']}) +optiondescription_1 = OptionDescription(name="my_family_1", doc="My family type", children=[option_2, optiondescription_3], properties=frozenset({"standard"}), informations={'ymlfiles': ['tests/types/types/family_dynfamily/00_structure.yml', 'tests/types/structures/family_dynfamily/00_structure.yml']}) +option_7 = StrOption(name="a_first_variable", doc="a first variable", default="a value", properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['tests/types/types/family_dynfamily/00_structure.yml', 'tests/types/structures/family_dynfamily/00_structure.yml'], 'type': 'string'}) +option_9 = StrOption(name="identifier", doc="identifier", multi=True, default=["family"], default_multi="family", properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['tests/types/types/family_dynfamily/00_structure.yml', 'tests/types/structures/family_dynfamily/00_structure.yml'], 'type': 'string'}) +option_10 = StrOption(name="a_second_variable", doc="a second variable", properties=frozenset({"basic", "mandatory"}), informations={'ymlfiles': ['tests/types/types/family_dynfamily/00_structure.yml', 'tests/types/structures/family_dynfamily/00_structure.yml'], 'type': 'string'}) +optiondescription_8 = OptionDescription(name="a_sub_{{ identifier }}", doc="My sub{{ identifier }}", children=[option_9, option_10], properties=frozenset({"basic"}), informations={'ymlfiles': ['tests/types/types/family_dynfamily/00_structure.yml', 'tests/types/structures/family_dynfamily/00_structure.yml']}) +optiondescription_6 = OptionDescription(name="my_family_2", doc="My family type", children=[option_7, optiondescription_8], properties=frozenset({"basic"}), informations={'ymlfiles': ['tests/types/types/family_dynfamily/00_structure.yml', 'tests/types/structures/family_dynfamily/00_structure.yml']}) +option_12 = StrOption(name="a_first_variable", doc="a first variable", default="a value", properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['tests/types/types/family_dynfamily/00_structure.yml', 'tests/types/structures/family_dynfamily/00_structure.yml'], 'type': 'string'}) +option_14 = StrOption(name="identifier", doc="identifier", multi=True, default=["family"], default_multi="family", properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['tests/types/types/family_dynfamily/00_structure.yml', 'tests/types/structures/family_dynfamily/00_structure.yml'], 'type': 'string'}) +option_15 = StrOption(name="a_second_variable", doc="a second variable", default="a modified value 2", properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['tests/types/types/family_dynfamily/00_structure.yml', 'tests/types/structures/family_dynfamily/00_structure.yml'], 'type': 'string'}) +optiondescription_13 = OptionDescription(name="a_sub_{{ identifier }}", doc="My sub{{ identifier }}", children=[option_14, option_15], properties=frozenset({"standard"}), informations={'ymlfiles': ['tests/types/types/family_dynfamily/00_structure.yml', 'tests/types/structures/family_dynfamily/00_structure.yml']}) +optiondescription_11 = OptionDescription(name="my_family_3", doc="My family type", children=[option_12, optiondescription_13], properties=frozenset({"standard"}), informations={'ymlfiles': ['tests/types/types/family_dynfamily/00_structure.yml', 'tests/types/structures/family_dynfamily/00_structure.yml']}) +option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1, optiondescription_6, optiondescription_11]) diff --git a/tests/types/result/family_dynfamily/variables.json b/tests/types/result/family_dynfamily/variables.json index b04706b97..6697d1f9d 100644 --- a/tests/types/result/family_dynfamily/variables.json +++ b/tests/types/result/family_dynfamily/variables.json @@ -1,17 +1,17 @@ { - "ns2.my_family_1.a_first_variable": "a modified value", - "ns2.my_family_1.a_sub_{{\u00a0identifier }}.identifier": [ + "my_family_1.a_first_variable": "a modified value", + "my_family_1.a_sub_{{\u00a0identifier }}.identifier": [ "family" ], - "ns2.my_family_1.a_sub_{{\u00a0identifier }}.a_second_variable": "a modified value", - "ns2.my_family_2.a_first_variable": "a value", - "ns2.my_family_2.a_sub_{{\u00a0identifier }}.identifier": [ + "my_family_1.a_sub_{{\u00a0identifier }}.a_second_variable": "a modified value", + "my_family_2.a_first_variable": "a value", + "my_family_2.a_sub_{{\u00a0identifier }}.identifier": [ "family" ], - "ns2.my_family_2.a_sub_{{\u00a0identifier }}.a_second_variable": null, - "ns2.my_family_3.a_first_variable": "a value", - "ns2.my_family_3.a_sub_{{\u00a0identifier }}.identifier": [ + "my_family_2.a_sub_{{\u00a0identifier }}.a_second_variable": null, + "my_family_3.a_first_variable": "a value", + "my_family_3.a_sub_{{\u00a0identifier }}.identifier": [ "family" ], - "ns2.my_family_3.a_sub_{{\u00a0identifier }}.a_second_variable": "a modified value 2" + "my_family_3.a_sub_{{\u00a0identifier }}.a_second_variable": "a modified value 2" } \ No newline at end of file diff --git a/tests/types/result/family_dynfamily/variables_rw.json b/tests/types/result/family_dynfamily/variables_rw.json index b04706b97..6697d1f9d 100644 --- a/tests/types/result/family_dynfamily/variables_rw.json +++ b/tests/types/result/family_dynfamily/variables_rw.json @@ -1,17 +1,17 @@ { - "ns2.my_family_1.a_first_variable": "a modified value", - "ns2.my_family_1.a_sub_{{\u00a0identifier }}.identifier": [ + "my_family_1.a_first_variable": "a modified value", + "my_family_1.a_sub_{{\u00a0identifier }}.identifier": [ "family" ], - "ns2.my_family_1.a_sub_{{\u00a0identifier }}.a_second_variable": "a modified value", - "ns2.my_family_2.a_first_variable": "a value", - "ns2.my_family_2.a_sub_{{\u00a0identifier }}.identifier": [ + "my_family_1.a_sub_{{\u00a0identifier }}.a_second_variable": "a modified value", + "my_family_2.a_first_variable": "a value", + "my_family_2.a_sub_{{\u00a0identifier }}.identifier": [ "family" ], - "ns2.my_family_2.a_sub_{{\u00a0identifier }}.a_second_variable": null, - "ns2.my_family_3.a_first_variable": "a value", - "ns2.my_family_3.a_sub_{{\u00a0identifier }}.identifier": [ + "my_family_2.a_sub_{{\u00a0identifier }}.a_second_variable": null, + "my_family_3.a_first_variable": "a value", + "my_family_3.a_sub_{{\u00a0identifier }}.identifier": [ "family" ], - "ns2.my_family_3.a_sub_{{\u00a0identifier }}.a_second_variable": "a modified value 2" + "my_family_3.a_sub_{{\u00a0identifier }}.a_second_variable": "a modified value 2" } \ No newline at end of file diff --git a/tests/types/result/family_name_description/tiramisu.py b/tests/types/result/family_name_description/tiramisu.py index eb2c3d990..e1addec8a 100644 --- a/tests/types/result/family_name_description/tiramisu.py +++ b/tests/types/result/family_name_description/tiramisu.py @@ -9,9 +9,8 @@ except: ALLOWED_LEADER_PROPERTIES.add("basic") ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") -option_4 = StrOption(name="name", doc="My first variable", default="a new value", properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['tests/types/types/family_name_description/00_structure.yml', 'tests/types/structures/family_name_description/00_structure.yml'], 'type': 'string'}) -option_5 = StrOption(name="description", doc="My second variable", default="an other new value", properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['tests/types/types/family_name_description/00_structure.yml', 'tests/types/structures/family_name_description/00_structure.yml'], 'type': 'string'}) -option_6 = StrOption(name="type", doc="My third variable", default="again an other new value", properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['tests/types/types/family_name_description/00_structure.yml', 'tests/types/structures/family_name_description/00_structure.yml'], 'type': 'string'}) -optiondescription_3 = OptionDescription(name="my_family", doc="My family type", children=[option_4, option_5, option_6], properties=frozenset({"standard"}), informations={'ymlfiles': ['tests/types/types/family_name_description/00_structure.yml', 'tests/types/structures/family_name_description/00_structure.yml']}) -optiondescription_2 = OptionDescription(name="ns2", doc="NS2", group_type=groups.namespace, children=[optiondescription_3], properties=frozenset({"standard"})) -option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_2]) +option_2 = StrOption(name="name", doc="My first variable", default="a new value", properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['tests/types/types/family_name_description/00_structure.yml', 'tests/types/structures/family_name_description/00_structure.yml'], 'type': 'string'}) +option_3 = StrOption(name="description", doc="My second variable", default="an other new value", properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['tests/types/types/family_name_description/00_structure.yml', 'tests/types/structures/family_name_description/00_structure.yml'], 'type': 'string'}) +option_4 = StrOption(name="type", doc="My third variable", default="again an other new value", properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['tests/types/types/family_name_description/00_structure.yml', 'tests/types/structures/family_name_description/00_structure.yml'], 'type': 'string'}) +optiondescription_1 = OptionDescription(name="my_family", doc="My family type", children=[option_2, option_3, option_4], properties=frozenset({"standard"}), informations={'ymlfiles': ['tests/types/types/family_name_description/00_structure.yml', 'tests/types/structures/family_name_description/00_structure.yml']}) +option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1]) diff --git a/tests/types/result/family_name_description/variables.json b/tests/types/result/family_name_description/variables.json index 70d9c632c..1484086b9 100644 --- a/tests/types/result/family_name_description/variables.json +++ b/tests/types/result/family_name_description/variables.json @@ -1,5 +1,5 @@ { - "ns2.my_family.description": "an other new value", - "ns2.my_family.type": "again an other new value", - "ns2.my_family.name": "a new value" + "my_family.name": "a new value", + "my_family.description": "an other new value", + "my_family.type": "again an other new value" } \ No newline at end of file diff --git a/tests/types/result/family_name_description/variables_rw.json b/tests/types/result/family_name_description/variables_rw.json index 70d9c632c..1484086b9 100644 --- a/tests/types/result/family_name_description/variables_rw.json +++ b/tests/types/result/family_name_description/variables_rw.json @@ -1,5 +1,5 @@ { - "ns2.my_family.description": "an other new value", - "ns2.my_family.type": "again an other new value", - "ns2.my_family.name": "a new value" + "my_family.name": "a new value", + "my_family.description": "an other new value", + "my_family.type": "again an other new value" } \ No newline at end of file diff --git a/tests/types/result/family_param/namespace_tiramisu.py b/tests/types/result/family_param/namespace_tiramisu.py index 0f9f4acd3..01fc60358 100644 --- a/tests/types/result/family_param/namespace_tiramisu.py +++ b/tests/types/result/family_param/namespace_tiramisu.py @@ -9,6 +9,7 @@ except: ALLOWED_LEADER_PROPERTIES.add("basic") ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") -option_2 = BoolOption(name="my_variable", doc="my variable", default=False, properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['tests/types/types/family_param/00_type.yml', 'tests/types/structures/family_param/00_structure.yml'], 'type': 'boolean'}) -optiondescription_1 = OptionDescription(name="my_family", doc="My family type", children=[option_2], properties=frozenset({"standard"}), informations={'ymlfiles': ['tests/types/types/family_param/00_type.yml', 'tests/types/structures/family_param/00_structure.yml']}) -option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1]) +option_4 = BoolOption(name="my_variable", doc="my variable", default=False, properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['tests/types/types/family_param/00_type.yml', 'tests/types/structures/family_param/00_structure.yml'], 'type': 'boolean'}) +optiondescription_3 = OptionDescription(name="my_family", doc="My family type", children=[option_4], properties=frozenset({"standard"}), informations={'ymlfiles': ['tests/types/types/family_param/00_type.yml', 'tests/types/structures/family_param/00_structure.yml']}) +optiondescription_2 = OptionDescription(name="ns2", doc="NS2", group_type=groups.namespace, children=[optiondescription_3], properties=frozenset({"standard"})) +option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_2]) diff --git a/tests/types/result/family_param/namespace_variables.json b/tests/types/result/family_param/namespace_variables.json index 5d566d9ca..f0edbbbe1 100644 --- a/tests/types/result/family_param/namespace_variables.json +++ b/tests/types/result/family_param/namespace_variables.json @@ -1,3 +1,3 @@ { - "my_family.my_variable": false + "ns2.my_family.my_variable": false } \ No newline at end of file diff --git a/tests/types/result/family_param/namespace_variables_rw.json b/tests/types/result/family_param/namespace_variables_rw.json index 5d566d9ca..f0edbbbe1 100644 --- a/tests/types/result/family_param/namespace_variables_rw.json +++ b/tests/types/result/family_param/namespace_variables_rw.json @@ -1,3 +1,3 @@ { - "my_family.my_variable": false + "ns2.my_family.my_variable": false } \ No newline at end of file diff --git a/tests/types/result/family_param/tiramisu.py b/tests/types/result/family_param/tiramisu.py index 01fc60358..0f9f4acd3 100644 --- a/tests/types/result/family_param/tiramisu.py +++ b/tests/types/result/family_param/tiramisu.py @@ -9,7 +9,6 @@ except: ALLOWED_LEADER_PROPERTIES.add("basic") ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") -option_4 = BoolOption(name="my_variable", doc="my variable", default=False, properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['tests/types/types/family_param/00_type.yml', 'tests/types/structures/family_param/00_structure.yml'], 'type': 'boolean'}) -optiondescription_3 = OptionDescription(name="my_family", doc="My family type", children=[option_4], properties=frozenset({"standard"}), informations={'ymlfiles': ['tests/types/types/family_param/00_type.yml', 'tests/types/structures/family_param/00_structure.yml']}) -optiondescription_2 = OptionDescription(name="ns2", doc="NS2", group_type=groups.namespace, children=[optiondescription_3], properties=frozenset({"standard"})) -option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_2]) +option_2 = BoolOption(name="my_variable", doc="my variable", default=False, properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['tests/types/types/family_param/00_type.yml', 'tests/types/structures/family_param/00_structure.yml'], 'type': 'boolean'}) +optiondescription_1 = OptionDescription(name="my_family", doc="My family type", children=[option_2], properties=frozenset({"standard"}), informations={'ymlfiles': ['tests/types/types/family_param/00_type.yml', 'tests/types/structures/family_param/00_structure.yml']}) +option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1]) diff --git a/tests/types/result/family_param/variables.json b/tests/types/result/family_param/variables.json index f0edbbbe1..5d566d9ca 100644 --- a/tests/types/result/family_param/variables.json +++ b/tests/types/result/family_param/variables.json @@ -1,3 +1,3 @@ { - "ns2.my_family.my_variable": false + "my_family.my_variable": false } \ No newline at end of file diff --git a/tests/types/result/family_param/variables_rw.json b/tests/types/result/family_param/variables_rw.json index f0edbbbe1..5d566d9ca 100644 --- a/tests/types/result/family_param/variables_rw.json +++ b/tests/types/result/family_param/variables_rw.json @@ -1,3 +1,3 @@ { - "ns2.my_family.my_variable": false + "my_family.my_variable": false } \ No newline at end of file diff --git a/tests/types/result/family_redefine/namespace_tiramisu.py b/tests/types/result/family_redefine/namespace_tiramisu.py index 975e2dfaf..94b368c7f 100644 --- a/tests/types/result/family_redefine/namespace_tiramisu.py +++ b/tests/types/result/family_redefine/namespace_tiramisu.py @@ -9,13 +9,14 @@ except: ALLOWED_LEADER_PROPERTIES.add("basic") ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") -option_2 = StrOption(name="a_first_variable", doc="a first variable", default="a modified value", properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['tests/types/types/family_redefine/00_structure.yml', 'tests/types/structures/family_redefine/00_structure.yml'], 'type': 'string'}) -option_3 = StrOption(name="a_second_variable", doc="a second variable", default="a modified value", properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['tests/types/types/family_redefine/00_structure.yml', 'tests/types/structures/family_redefine/00_structure.yml'], 'type': 'string'}) -optiondescription_1 = OptionDescription(name="my_family_1", doc="My family type", children=[option_2, option_3], properties=frozenset({"standard"}), informations={'ymlfiles': ['tests/types/types/family_redefine/00_structure.yml', 'tests/types/structures/family_redefine/00_structure.yml']}) -option_5 = StrOption(name="a_first_variable", doc="a first variable", default="a value", properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['tests/types/types/family_redefine/00_structure.yml', 'tests/types/structures/family_redefine/00_structure.yml'], 'type': 'string'}) -option_6 = StrOption(name="a_second_variable", doc="a second variable", properties=frozenset({"basic", "mandatory"}), informations={'ymlfiles': ['tests/types/types/family_redefine/00_structure.yml', 'tests/types/structures/family_redefine/00_structure.yml'], 'type': 'string'}) -optiondescription_4 = OptionDescription(name="my_family_2", doc="My family type", children=[option_5, option_6], properties=frozenset({"basic"}), informations={'ymlfiles': ['tests/types/types/family_redefine/00_structure.yml', 'tests/types/structures/family_redefine/00_structure.yml']}) -option_8 = StrOption(name="a_first_variable", doc="a first variable", default="a value", properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['tests/types/types/family_redefine/00_structure.yml', 'tests/types/structures/family_redefine/00_structure.yml'], 'type': 'string'}) -option_9 = StrOption(name="a_second_variable", doc="a second variable", default="a modified value 2", properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['tests/types/types/family_redefine/00_structure.yml', 'tests/types/structures/family_redefine/00_structure.yml'], 'type': 'string'}) -optiondescription_7 = OptionDescription(name="my_family_3", doc="My family type", children=[option_8, option_9], properties=frozenset({"standard"}), informations={'ymlfiles': ['tests/types/types/family_redefine/00_structure.yml', 'tests/types/structures/family_redefine/00_structure.yml']}) -option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1, optiondescription_4, optiondescription_7]) +option_4 = StrOption(name="a_first_variable", doc="a first variable", default="a modified value", properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['tests/types/types/family_redefine/00_structure.yml', 'tests/types/structures/family_redefine/00_structure.yml'], 'type': 'string'}) +option_5 = StrOption(name="a_second_variable", doc="a second variable", default="a modified value", properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['tests/types/types/family_redefine/00_structure.yml', 'tests/types/structures/family_redefine/00_structure.yml'], 'type': 'string'}) +optiondescription_3 = OptionDescription(name="my_family_1", doc="My family type", children=[option_4, option_5], properties=frozenset({"standard"}), informations={'ymlfiles': ['tests/types/types/family_redefine/00_structure.yml', 'tests/types/structures/family_redefine/00_structure.yml']}) +option_7 = StrOption(name="a_first_variable", doc="a first variable", default="a value", properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['tests/types/types/family_redefine/00_structure.yml', 'tests/types/structures/family_redefine/00_structure.yml'], 'type': 'string'}) +option_8 = StrOption(name="a_second_variable", doc="a second variable", properties=frozenset({"basic", "mandatory"}), informations={'ymlfiles': ['tests/types/types/family_redefine/00_structure.yml', 'tests/types/structures/family_redefine/00_structure.yml'], 'type': 'string'}) +optiondescription_6 = OptionDescription(name="my_family_2", doc="My family type", children=[option_7, option_8], properties=frozenset({"basic"}), informations={'ymlfiles': ['tests/types/types/family_redefine/00_structure.yml', 'tests/types/structures/family_redefine/00_structure.yml']}) +option_10 = StrOption(name="a_first_variable", doc="a first variable", default="a value", properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['tests/types/types/family_redefine/00_structure.yml', 'tests/types/structures/family_redefine/00_structure.yml'], 'type': 'string'}) +option_11 = StrOption(name="a_second_variable", doc="a second variable", default="a modified value 2", properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['tests/types/types/family_redefine/00_structure.yml', 'tests/types/structures/family_redefine/00_structure.yml'], 'type': 'string'}) +optiondescription_9 = OptionDescription(name="my_family_3", doc="My family type", children=[option_10, option_11], properties=frozenset({"standard"}), informations={'ymlfiles': ['tests/types/types/family_redefine/00_structure.yml', 'tests/types/structures/family_redefine/00_structure.yml']}) +optiondescription_2 = OptionDescription(name="ns2", doc="NS2", group_type=groups.namespace, children=[optiondescription_3, optiondescription_6, optiondescription_9], properties=frozenset({"basic"})) +option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_2]) diff --git a/tests/types/result/family_redefine/namespace_variables.json b/tests/types/result/family_redefine/namespace_variables.json index f73c2d4ca..d1013edce 100644 --- a/tests/types/result/family_redefine/namespace_variables.json +++ b/tests/types/result/family_redefine/namespace_variables.json @@ -1,8 +1,8 @@ { - "my_family_1.a_first_variable": "a modified value", - "my_family_1.a_second_variable": "a modified value", - "my_family_2.a_first_variable": "a value", - "my_family_2.a_second_variable": null, - "my_family_3.a_first_variable": "a value", - "my_family_3.a_second_variable": "a modified value 2" + "ns2.my_family_1.a_first_variable": "a modified value", + "ns2.my_family_1.a_second_variable": "a modified value", + "ns2.my_family_2.a_first_variable": "a value", + "ns2.my_family_2.a_second_variable": null, + "ns2.my_family_3.a_first_variable": "a value", + "ns2.my_family_3.a_second_variable": "a modified value 2" } \ No newline at end of file diff --git a/tests/types/result/family_redefine/namespace_variables_rw.json b/tests/types/result/family_redefine/namespace_variables_rw.json index f73c2d4ca..d1013edce 100644 --- a/tests/types/result/family_redefine/namespace_variables_rw.json +++ b/tests/types/result/family_redefine/namespace_variables_rw.json @@ -1,8 +1,8 @@ { - "my_family_1.a_first_variable": "a modified value", - "my_family_1.a_second_variable": "a modified value", - "my_family_2.a_first_variable": "a value", - "my_family_2.a_second_variable": null, - "my_family_3.a_first_variable": "a value", - "my_family_3.a_second_variable": "a modified value 2" + "ns2.my_family_1.a_first_variable": "a modified value", + "ns2.my_family_1.a_second_variable": "a modified value", + "ns2.my_family_2.a_first_variable": "a value", + "ns2.my_family_2.a_second_variable": null, + "ns2.my_family_3.a_first_variable": "a value", + "ns2.my_family_3.a_second_variable": "a modified value 2" } \ No newline at end of file diff --git a/tests/types/result/family_redefine/tiramisu.py b/tests/types/result/family_redefine/tiramisu.py index 94b368c7f..975e2dfaf 100644 --- a/tests/types/result/family_redefine/tiramisu.py +++ b/tests/types/result/family_redefine/tiramisu.py @@ -9,14 +9,13 @@ except: ALLOWED_LEADER_PROPERTIES.add("basic") ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") -option_4 = StrOption(name="a_first_variable", doc="a first variable", default="a modified value", properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['tests/types/types/family_redefine/00_structure.yml', 'tests/types/structures/family_redefine/00_structure.yml'], 'type': 'string'}) -option_5 = StrOption(name="a_second_variable", doc="a second variable", default="a modified value", properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['tests/types/types/family_redefine/00_structure.yml', 'tests/types/structures/family_redefine/00_structure.yml'], 'type': 'string'}) -optiondescription_3 = OptionDescription(name="my_family_1", doc="My family type", children=[option_4, option_5], properties=frozenset({"standard"}), informations={'ymlfiles': ['tests/types/types/family_redefine/00_structure.yml', 'tests/types/structures/family_redefine/00_structure.yml']}) -option_7 = StrOption(name="a_first_variable", doc="a first variable", default="a value", properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['tests/types/types/family_redefine/00_structure.yml', 'tests/types/structures/family_redefine/00_structure.yml'], 'type': 'string'}) -option_8 = StrOption(name="a_second_variable", doc="a second variable", properties=frozenset({"basic", "mandatory"}), informations={'ymlfiles': ['tests/types/types/family_redefine/00_structure.yml', 'tests/types/structures/family_redefine/00_structure.yml'], 'type': 'string'}) -optiondescription_6 = OptionDescription(name="my_family_2", doc="My family type", children=[option_7, option_8], properties=frozenset({"basic"}), informations={'ymlfiles': ['tests/types/types/family_redefine/00_structure.yml', 'tests/types/structures/family_redefine/00_structure.yml']}) -option_10 = StrOption(name="a_first_variable", doc="a first variable", default="a value", properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['tests/types/types/family_redefine/00_structure.yml', 'tests/types/structures/family_redefine/00_structure.yml'], 'type': 'string'}) -option_11 = StrOption(name="a_second_variable", doc="a second variable", default="a modified value 2", properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['tests/types/types/family_redefine/00_structure.yml', 'tests/types/structures/family_redefine/00_structure.yml'], 'type': 'string'}) -optiondescription_9 = OptionDescription(name="my_family_3", doc="My family type", children=[option_10, option_11], properties=frozenset({"standard"}), informations={'ymlfiles': ['tests/types/types/family_redefine/00_structure.yml', 'tests/types/structures/family_redefine/00_structure.yml']}) -optiondescription_2 = OptionDescription(name="ns2", doc="NS2", group_type=groups.namespace, children=[optiondescription_3, optiondescription_6, optiondescription_9], properties=frozenset({"basic"})) -option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_2]) +option_2 = StrOption(name="a_first_variable", doc="a first variable", default="a modified value", properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['tests/types/types/family_redefine/00_structure.yml', 'tests/types/structures/family_redefine/00_structure.yml'], 'type': 'string'}) +option_3 = StrOption(name="a_second_variable", doc="a second variable", default="a modified value", properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['tests/types/types/family_redefine/00_structure.yml', 'tests/types/structures/family_redefine/00_structure.yml'], 'type': 'string'}) +optiondescription_1 = OptionDescription(name="my_family_1", doc="My family type", children=[option_2, option_3], properties=frozenset({"standard"}), informations={'ymlfiles': ['tests/types/types/family_redefine/00_structure.yml', 'tests/types/structures/family_redefine/00_structure.yml']}) +option_5 = StrOption(name="a_first_variable", doc="a first variable", default="a value", properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['tests/types/types/family_redefine/00_structure.yml', 'tests/types/structures/family_redefine/00_structure.yml'], 'type': 'string'}) +option_6 = StrOption(name="a_second_variable", doc="a second variable", properties=frozenset({"basic", "mandatory"}), informations={'ymlfiles': ['tests/types/types/family_redefine/00_structure.yml', 'tests/types/structures/family_redefine/00_structure.yml'], 'type': 'string'}) +optiondescription_4 = OptionDescription(name="my_family_2", doc="My family type", children=[option_5, option_6], properties=frozenset({"basic"}), informations={'ymlfiles': ['tests/types/types/family_redefine/00_structure.yml', 'tests/types/structures/family_redefine/00_structure.yml']}) +option_8 = StrOption(name="a_first_variable", doc="a first variable", default="a value", properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['tests/types/types/family_redefine/00_structure.yml', 'tests/types/structures/family_redefine/00_structure.yml'], 'type': 'string'}) +option_9 = StrOption(name="a_second_variable", doc="a second variable", default="a modified value 2", properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['tests/types/types/family_redefine/00_structure.yml', 'tests/types/structures/family_redefine/00_structure.yml'], 'type': 'string'}) +optiondescription_7 = OptionDescription(name="my_family_3", doc="My family type", children=[option_8, option_9], properties=frozenset({"standard"}), informations={'ymlfiles': ['tests/types/types/family_redefine/00_structure.yml', 'tests/types/structures/family_redefine/00_structure.yml']}) +option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1, optiondescription_4, optiondescription_7]) diff --git a/tests/types/result/family_redefine/variables.json b/tests/types/result/family_redefine/variables.json index d1013edce..f73c2d4ca 100644 --- a/tests/types/result/family_redefine/variables.json +++ b/tests/types/result/family_redefine/variables.json @@ -1,8 +1,8 @@ { - "ns2.my_family_1.a_first_variable": "a modified value", - "ns2.my_family_1.a_second_variable": "a modified value", - "ns2.my_family_2.a_first_variable": "a value", - "ns2.my_family_2.a_second_variable": null, - "ns2.my_family_3.a_first_variable": "a value", - "ns2.my_family_3.a_second_variable": "a modified value 2" + "my_family_1.a_first_variable": "a modified value", + "my_family_1.a_second_variable": "a modified value", + "my_family_2.a_first_variable": "a value", + "my_family_2.a_second_variable": null, + "my_family_3.a_first_variable": "a value", + "my_family_3.a_second_variable": "a modified value 2" } \ No newline at end of file diff --git a/tests/types/result/family_redefine/variables_rw.json b/tests/types/result/family_redefine/variables_rw.json index d1013edce..f73c2d4ca 100644 --- a/tests/types/result/family_redefine/variables_rw.json +++ b/tests/types/result/family_redefine/variables_rw.json @@ -1,8 +1,8 @@ { - "ns2.my_family_1.a_first_variable": "a modified value", - "ns2.my_family_1.a_second_variable": "a modified value", - "ns2.my_family_2.a_first_variable": "a value", - "ns2.my_family_2.a_second_variable": null, - "ns2.my_family_3.a_first_variable": "a value", - "ns2.my_family_3.a_second_variable": "a modified value 2" + "my_family_1.a_first_variable": "a modified value", + "my_family_1.a_second_variable": "a modified value", + "my_family_2.a_first_variable": "a value", + "my_family_2.a_second_variable": null, + "my_family_3.a_first_variable": "a value", + "my_family_3.a_second_variable": "a modified value 2" } \ No newline at end of file diff --git a/tests/types/result/family_redefine_type/namespace_tiramisu.py b/tests/types/result/family_redefine_type/namespace_tiramisu.py index 223c0e321..1099349ab 100644 --- a/tests/types/result/family_redefine_type/namespace_tiramisu.py +++ b/tests/types/result/family_redefine_type/namespace_tiramisu.py @@ -9,6 +9,7 @@ except: ALLOWED_LEADER_PROPERTIES.add("basic") ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") -option_2 = PasswordOption(name="my_type", doc="My type", default="a value", properties=frozenset({"mandatory", "one_tag", "standard"}), informations={'ymlfiles': ['tests/types/types/family_redefine_type/00_type.yml', 'tests/types/structures/family_redefine_type/00_structure.yml'], 'type': 'secret', 'tags': ('one_tag',)}) -optiondescription_1 = OptionDescription(name="my_family", doc="My family type", children=[option_2], properties=frozenset({"standard"}), informations={'ymlfiles': ['tests/types/types/family_redefine_type/00_type.yml', 'tests/types/structures/family_redefine_type/00_structure.yml']}) -option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1]) +option_4 = PasswordOption(name="my_type", doc="My type", default="a value", properties=frozenset({"mandatory", "one_tag", "standard"}), informations={'ymlfiles': ['tests/types/types/family_redefine_type/00_type.yml', 'tests/types/structures/family_redefine_type/00_structure.yml'], 'type': 'secret', 'tags': ('one_tag',)}) +optiondescription_3 = OptionDescription(name="my_family", doc="My family type", children=[option_4], properties=frozenset({"standard"}), informations={'ymlfiles': ['tests/types/types/family_redefine_type/00_type.yml', 'tests/types/structures/family_redefine_type/00_structure.yml']}) +optiondescription_2 = OptionDescription(name="ns2", doc="NS2", group_type=groups.namespace, children=[optiondescription_3], properties=frozenset({"standard"})) +option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_2]) diff --git a/tests/types/result/family_redefine_type/namespace_variables.json b/tests/types/result/family_redefine_type/namespace_variables.json index cc45aa4fc..36946fb4c 100644 --- a/tests/types/result/family_redefine_type/namespace_variables.json +++ b/tests/types/result/family_redefine_type/namespace_variables.json @@ -1,3 +1,3 @@ { - "my_family.my_type": "a value" + "ns2.my_family.my_type": "a value" } \ No newline at end of file diff --git a/tests/types/result/family_redefine_type/namespace_variables_rw.json b/tests/types/result/family_redefine_type/namespace_variables_rw.json index cc45aa4fc..36946fb4c 100644 --- a/tests/types/result/family_redefine_type/namespace_variables_rw.json +++ b/tests/types/result/family_redefine_type/namespace_variables_rw.json @@ -1,3 +1,3 @@ { - "my_family.my_type": "a value" + "ns2.my_family.my_type": "a value" } \ No newline at end of file diff --git a/tests/types/result/family_redefine_type/tiramisu.py b/tests/types/result/family_redefine_type/tiramisu.py index 1099349ab..223c0e321 100644 --- a/tests/types/result/family_redefine_type/tiramisu.py +++ b/tests/types/result/family_redefine_type/tiramisu.py @@ -9,7 +9,6 @@ except: ALLOWED_LEADER_PROPERTIES.add("basic") ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") -option_4 = PasswordOption(name="my_type", doc="My type", default="a value", properties=frozenset({"mandatory", "one_tag", "standard"}), informations={'ymlfiles': ['tests/types/types/family_redefine_type/00_type.yml', 'tests/types/structures/family_redefine_type/00_structure.yml'], 'type': 'secret', 'tags': ('one_tag',)}) -optiondescription_3 = OptionDescription(name="my_family", doc="My family type", children=[option_4], properties=frozenset({"standard"}), informations={'ymlfiles': ['tests/types/types/family_redefine_type/00_type.yml', 'tests/types/structures/family_redefine_type/00_structure.yml']}) -optiondescription_2 = OptionDescription(name="ns2", doc="NS2", group_type=groups.namespace, children=[optiondescription_3], properties=frozenset({"standard"})) -option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_2]) +option_2 = PasswordOption(name="my_type", doc="My type", default="a value", properties=frozenset({"mandatory", "one_tag", "standard"}), informations={'ymlfiles': ['tests/types/types/family_redefine_type/00_type.yml', 'tests/types/structures/family_redefine_type/00_structure.yml'], 'type': 'secret', 'tags': ('one_tag',)}) +optiondescription_1 = OptionDescription(name="my_family", doc="My family type", children=[option_2], properties=frozenset({"standard"}), informations={'ymlfiles': ['tests/types/types/family_redefine_type/00_type.yml', 'tests/types/structures/family_redefine_type/00_structure.yml']}) +option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1]) diff --git a/tests/types/result/family_redefine_type/variables.json b/tests/types/result/family_redefine_type/variables.json index 36946fb4c..cc45aa4fc 100644 --- a/tests/types/result/family_redefine_type/variables.json +++ b/tests/types/result/family_redefine_type/variables.json @@ -1,3 +1,3 @@ { - "ns2.my_family.my_type": "a value" + "my_family.my_type": "a value" } \ No newline at end of file diff --git a/tests/types/result/family_redefine_type/variables_rw.json b/tests/types/result/family_redefine_type/variables_rw.json index 36946fb4c..cc45aa4fc 100644 --- a/tests/types/result/family_redefine_type/variables_rw.json +++ b/tests/types/result/family_redefine_type/variables_rw.json @@ -1,3 +1,3 @@ { - "ns2.my_family.my_type": "a value" + "my_family.my_type": "a value" } \ No newline at end of file diff --git a/tests/types/result/family_root_dynfamily/namespace_tiramisu.py b/tests/types/result/family_root_dynfamily/namespace_tiramisu.py index a94362ab2..01f0bdec5 100644 --- a/tests/types/result/family_root_dynfamily/namespace_tiramisu.py +++ b/tests/types/result/family_root_dynfamily/namespace_tiramisu.py @@ -9,7 +9,8 @@ except: ALLOWED_LEADER_PROPERTIES.add("basic") ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") -option_1 = StrOption(name="a_variable", doc="A variable", multi=True, default=["val1", "val2"], default_multi="val1", properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['tests/types/structures/family_root_dynfamily/00_structure.yml'], 'type': 'string'}) -option_3 = StrOption(name="a_first_variable", doc="A first variable", default=Calculation(func['calc_value'], Params((ParamIdentifier()))), properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['tests/types/types/family_root_dynfamily/00_structure.yml', 'tests/types/structures/family_root_dynfamily/00_structure.yml'], 'type': 'string'}) -optiondescription_2 = ConvertDynOptionDescription(name="my_family_{{ identifier }}", doc="My family type", identifiers=Calculation(func['calc_value'], Params((ParamOption(option_1)))), children=[option_3], properties=frozenset({"standard"}), informations={'dynamic_variable': 'a_variable', 'ymlfiles': ['tests/types/types/family_root_dynfamily/00_structure.yml', 'tests/types/structures/family_root_dynfamily/00_structure.yml']}) -option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, optiondescription_2]) +option_3 = StrOption(name="a_variable", doc="A variable", multi=True, default=["val1", "val2"], default_multi="val1", properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['tests/types/structures/family_root_dynfamily/00_structure.yml'], 'type': 'string'}) +option_5 = StrOption(name="a_first_variable", doc="A first variable", default=Calculation(func['calc_value'], Params((ParamIdentifier()))), properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['tests/types/types/family_root_dynfamily/00_structure.yml', 'tests/types/structures/family_root_dynfamily/00_structure.yml'], 'type': 'string'}) +optiondescription_4 = ConvertDynOptionDescription(name="my_family_{{ identifier }}", doc="My family type", identifiers=Calculation(func['calc_value'], Params((ParamOption(option_3)))), children=[option_5], properties=frozenset({"standard"}), informations={'dynamic_variable': 'ns2.a_variable', 'ymlfiles': ['tests/types/types/family_root_dynfamily/00_structure.yml', 'tests/types/structures/family_root_dynfamily/00_structure.yml']}) +optiondescription_2 = OptionDescription(name="ns2", doc="NS2", group_type=groups.namespace, children=[option_3, optiondescription_4], properties=frozenset({"standard"})) +option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_2]) diff --git a/tests/types/result/family_root_dynfamily/namespace_variables.json b/tests/types/result/family_root_dynfamily/namespace_variables.json index afb6ad293..c2ad009c5 100644 --- a/tests/types/result/family_root_dynfamily/namespace_variables.json +++ b/tests/types/result/family_root_dynfamily/namespace_variables.json @@ -1,8 +1,8 @@ { - "a_variable": [ + "ns2.a_variable": [ "val1", "val2" ], - "my_family_val1.a_first_variable": "val1", - "my_family_val2.a_first_variable": "val2" + "ns2.my_family_val1.a_first_variable": "val1", + "ns2.my_family_val2.a_first_variable": "val2" } \ No newline at end of file diff --git a/tests/types/result/family_root_dynfamily/namespace_variables_rw.json b/tests/types/result/family_root_dynfamily/namespace_variables_rw.json index afb6ad293..c2ad009c5 100644 --- a/tests/types/result/family_root_dynfamily/namespace_variables_rw.json +++ b/tests/types/result/family_root_dynfamily/namespace_variables_rw.json @@ -1,8 +1,8 @@ { - "a_variable": [ + "ns2.a_variable": [ "val1", "val2" ], - "my_family_val1.a_first_variable": "val1", - "my_family_val2.a_first_variable": "val2" + "ns2.my_family_val1.a_first_variable": "val1", + "ns2.my_family_val2.a_first_variable": "val2" } \ No newline at end of file diff --git a/tests/types/result/family_root_dynfamily/tiramisu.py b/tests/types/result/family_root_dynfamily/tiramisu.py index 01f0bdec5..a94362ab2 100644 --- a/tests/types/result/family_root_dynfamily/tiramisu.py +++ b/tests/types/result/family_root_dynfamily/tiramisu.py @@ -9,8 +9,7 @@ except: ALLOWED_LEADER_PROPERTIES.add("basic") ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") -option_3 = StrOption(name="a_variable", doc="A variable", multi=True, default=["val1", "val2"], default_multi="val1", properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['tests/types/structures/family_root_dynfamily/00_structure.yml'], 'type': 'string'}) -option_5 = StrOption(name="a_first_variable", doc="A first variable", default=Calculation(func['calc_value'], Params((ParamIdentifier()))), properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['tests/types/types/family_root_dynfamily/00_structure.yml', 'tests/types/structures/family_root_dynfamily/00_structure.yml'], 'type': 'string'}) -optiondescription_4 = ConvertDynOptionDescription(name="my_family_{{ identifier }}", doc="My family type", identifiers=Calculation(func['calc_value'], Params((ParamOption(option_3)))), children=[option_5], properties=frozenset({"standard"}), informations={'dynamic_variable': 'ns2.a_variable', 'ymlfiles': ['tests/types/types/family_root_dynfamily/00_structure.yml', 'tests/types/structures/family_root_dynfamily/00_structure.yml']}) -optiondescription_2 = OptionDescription(name="ns2", doc="NS2", group_type=groups.namespace, children=[option_3, optiondescription_4], properties=frozenset({"standard"})) -option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_2]) +option_1 = StrOption(name="a_variable", doc="A variable", multi=True, default=["val1", "val2"], default_multi="val1", properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['tests/types/structures/family_root_dynfamily/00_structure.yml'], 'type': 'string'}) +option_3 = StrOption(name="a_first_variable", doc="A first variable", default=Calculation(func['calc_value'], Params((ParamIdentifier()))), properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['tests/types/types/family_root_dynfamily/00_structure.yml', 'tests/types/structures/family_root_dynfamily/00_structure.yml'], 'type': 'string'}) +optiondescription_2 = ConvertDynOptionDescription(name="my_family_{{ identifier }}", doc="My family type", identifiers=Calculation(func['calc_value'], Params((ParamOption(option_1)))), children=[option_3], properties=frozenset({"standard"}), informations={'dynamic_variable': 'a_variable', 'ymlfiles': ['tests/types/types/family_root_dynfamily/00_structure.yml', 'tests/types/structures/family_root_dynfamily/00_structure.yml']}) +option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, optiondescription_2]) diff --git a/tests/types/result/family_root_dynfamily/variables.json b/tests/types/result/family_root_dynfamily/variables.json index c2ad009c5..afb6ad293 100644 --- a/tests/types/result/family_root_dynfamily/variables.json +++ b/tests/types/result/family_root_dynfamily/variables.json @@ -1,8 +1,8 @@ { - "ns2.a_variable": [ + "a_variable": [ "val1", "val2" ], - "ns2.my_family_val1.a_first_variable": "val1", - "ns2.my_family_val2.a_first_variable": "val2" + "my_family_val1.a_first_variable": "val1", + "my_family_val2.a_first_variable": "val2" } \ No newline at end of file diff --git a/tests/types/result/family_root_dynfamily/variables_rw.json b/tests/types/result/family_root_dynfamily/variables_rw.json index c2ad009c5..afb6ad293 100644 --- a/tests/types/result/family_root_dynfamily/variables_rw.json +++ b/tests/types/result/family_root_dynfamily/variables_rw.json @@ -1,8 +1,8 @@ { - "ns2.a_variable": [ + "a_variable": [ "val1", "val2" ], - "ns2.my_family_val1.a_first_variable": "val1", - "ns2.my_family_val2.a_first_variable": "val2" + "my_family_val1.a_first_variable": "val1", + "my_family_val2.a_first_variable": "val2" } \ No newline at end of file diff --git a/tests/types/result/family_secret_manager/namespace_tiramisu.py b/tests/types/result/family_secret_manager/namespace_tiramisu.py index 34d290510..5cdc8ed5e 100644 --- a/tests/types/result/family_secret_manager/namespace_tiramisu.py +++ b/tests/types/result/family_secret_manager/namespace_tiramisu.py @@ -9,10 +9,11 @@ except: ALLOWED_LEADER_PROPERTIES.add("basic") ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") -option_2 = StrOption(name="a_variable", doc="A variable", default="my_value", properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['tests/types/types/family_secret_manager/00-base.yml', 'tests/types/structures/family_secret_manager/00-base.yml'], 'type': 'string'}) -option_3 = PasswordOption(name="secret", doc="the secret", properties=frozenset({"basic", "mandatory", "novalidator"}), informations={'secret_manager': True, 'ymlfiles': ['tests/types/types/family_secret_manager/00-base.yml', 'tests/types/structures/family_secret_manager/00-base.yml'], 'type': 'secret'}) -optiondescription_1 = OptionDescription(name="secret1", doc="Family with secret", children=[option_2, option_3], properties=frozenset({"basic"}), informations={'ymlfiles': ['tests/types/types/family_secret_manager/00-base.yml', 'tests/types/structures/family_secret_manager/00-base.yml']}) -option_5 = StrOption(name="a_variable", doc="A variable", default="my_value", properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['tests/types/types/family_secret_manager/00-base.yml', 'tests/types/structures/family_secret_manager/00-base.yml'], 'type': 'string'}) -option_6 = PasswordOption(name="secret", doc="the secret", properties=frozenset({"basic", "mandatory", "novalidator"}), informations={'secret_manager': True, 'ymlfiles': ['tests/types/types/family_secret_manager/00-base.yml', 'tests/types/structures/family_secret_manager/00-base.yml'], 'type': 'secret'}) -optiondescription_4 = OptionDescription(name="secret2", doc="Family with secret", children=[option_5, option_6], properties=frozenset({"basic"}), informations={'ymlfiles': ['tests/types/types/family_secret_manager/00-base.yml', 'tests/types/structures/family_secret_manager/00-base.yml']}) -option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1, optiondescription_4]) +option_4 = StrOption(name="a_variable", doc="A variable", default="my_value", properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['tests/types/types/family_secret_manager/00-base.yml', 'tests/types/structures/family_secret_manager/00-base.yml'], 'type': 'string'}) +option_5 = PasswordOption(name="secret", doc="the secret", properties=frozenset({"basic", "mandatory", "novalidator"}), informations={'secret_manager': True, 'ymlfiles': ['tests/types/types/family_secret_manager/00-base.yml', 'tests/types/structures/family_secret_manager/00-base.yml'], 'type': 'secret'}) +optiondescription_3 = OptionDescription(name="secret1", doc="Family with secret", children=[option_4, option_5], properties=frozenset({"basic"}), informations={'ymlfiles': ['tests/types/types/family_secret_manager/00-base.yml', 'tests/types/structures/family_secret_manager/00-base.yml']}) +option_7 = StrOption(name="a_variable", doc="A variable", default="my_value", properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['tests/types/types/family_secret_manager/00-base.yml', 'tests/types/structures/family_secret_manager/00-base.yml'], 'type': 'string'}) +option_8 = PasswordOption(name="secret", doc="the secret", properties=frozenset({"basic", "mandatory", "novalidator"}), informations={'secret_manager': True, 'ymlfiles': ['tests/types/types/family_secret_manager/00-base.yml', 'tests/types/structures/family_secret_manager/00-base.yml'], 'type': 'secret'}) +optiondescription_6 = OptionDescription(name="secret2", doc="Family with secret", children=[option_7, option_8], properties=frozenset({"basic"}), informations={'ymlfiles': ['tests/types/types/family_secret_manager/00-base.yml', 'tests/types/structures/family_secret_manager/00-base.yml']}) +optiondescription_2 = OptionDescription(name="ns2", doc="NS2", group_type=groups.namespace, children=[optiondescription_3, optiondescription_6], properties=frozenset({"basic"})) +option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_2]) diff --git a/tests/types/result/family_secret_manager/namespace_variables.json b/tests/types/result/family_secret_manager/namespace_variables.json index 5aed2ce54..6d5792c33 100644 --- a/tests/types/result/family_secret_manager/namespace_variables.json +++ b/tests/types/result/family_secret_manager/namespace_variables.json @@ -1,6 +1,6 @@ { - "secret1.a_variable": "my_value", - "secret1.secret": null, - "secret2.a_variable": "my_value", - "secret2.secret": null + "ns2.secret1.a_variable": "my_value", + "ns2.secret1.secret": null, + "ns2.secret2.a_variable": "my_value", + "ns2.secret2.secret": null } \ No newline at end of file diff --git a/tests/types/result/family_secret_manager/namespace_variables_rw.json b/tests/types/result/family_secret_manager/namespace_variables_rw.json index 5aed2ce54..6d5792c33 100644 --- a/tests/types/result/family_secret_manager/namespace_variables_rw.json +++ b/tests/types/result/family_secret_manager/namespace_variables_rw.json @@ -1,6 +1,6 @@ { - "secret1.a_variable": "my_value", - "secret1.secret": null, - "secret2.a_variable": "my_value", - "secret2.secret": null + "ns2.secret1.a_variable": "my_value", + "ns2.secret1.secret": null, + "ns2.secret2.a_variable": "my_value", + "ns2.secret2.secret": null } \ No newline at end of file diff --git a/tests/types/result/family_secret_manager/tiramisu.py b/tests/types/result/family_secret_manager/tiramisu.py index 5cdc8ed5e..34d290510 100644 --- a/tests/types/result/family_secret_manager/tiramisu.py +++ b/tests/types/result/family_secret_manager/tiramisu.py @@ -9,11 +9,10 @@ except: ALLOWED_LEADER_PROPERTIES.add("basic") ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") -option_4 = StrOption(name="a_variable", doc="A variable", default="my_value", properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['tests/types/types/family_secret_manager/00-base.yml', 'tests/types/structures/family_secret_manager/00-base.yml'], 'type': 'string'}) -option_5 = PasswordOption(name="secret", doc="the secret", properties=frozenset({"basic", "mandatory", "novalidator"}), informations={'secret_manager': True, 'ymlfiles': ['tests/types/types/family_secret_manager/00-base.yml', 'tests/types/structures/family_secret_manager/00-base.yml'], 'type': 'secret'}) -optiondescription_3 = OptionDescription(name="secret1", doc="Family with secret", children=[option_4, option_5], properties=frozenset({"basic"}), informations={'ymlfiles': ['tests/types/types/family_secret_manager/00-base.yml', 'tests/types/structures/family_secret_manager/00-base.yml']}) -option_7 = StrOption(name="a_variable", doc="A variable", default="my_value", properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['tests/types/types/family_secret_manager/00-base.yml', 'tests/types/structures/family_secret_manager/00-base.yml'], 'type': 'string'}) -option_8 = PasswordOption(name="secret", doc="the secret", properties=frozenset({"basic", "mandatory", "novalidator"}), informations={'secret_manager': True, 'ymlfiles': ['tests/types/types/family_secret_manager/00-base.yml', 'tests/types/structures/family_secret_manager/00-base.yml'], 'type': 'secret'}) -optiondescription_6 = OptionDescription(name="secret2", doc="Family with secret", children=[option_7, option_8], properties=frozenset({"basic"}), informations={'ymlfiles': ['tests/types/types/family_secret_manager/00-base.yml', 'tests/types/structures/family_secret_manager/00-base.yml']}) -optiondescription_2 = OptionDescription(name="ns2", doc="NS2", group_type=groups.namespace, children=[optiondescription_3, optiondescription_6], properties=frozenset({"basic"})) -option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_2]) +option_2 = StrOption(name="a_variable", doc="A variable", default="my_value", properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['tests/types/types/family_secret_manager/00-base.yml', 'tests/types/structures/family_secret_manager/00-base.yml'], 'type': 'string'}) +option_3 = PasswordOption(name="secret", doc="the secret", properties=frozenset({"basic", "mandatory", "novalidator"}), informations={'secret_manager': True, 'ymlfiles': ['tests/types/types/family_secret_manager/00-base.yml', 'tests/types/structures/family_secret_manager/00-base.yml'], 'type': 'secret'}) +optiondescription_1 = OptionDescription(name="secret1", doc="Family with secret", children=[option_2, option_3], properties=frozenset({"basic"}), informations={'ymlfiles': ['tests/types/types/family_secret_manager/00-base.yml', 'tests/types/structures/family_secret_manager/00-base.yml']}) +option_5 = StrOption(name="a_variable", doc="A variable", default="my_value", properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['tests/types/types/family_secret_manager/00-base.yml', 'tests/types/structures/family_secret_manager/00-base.yml'], 'type': 'string'}) +option_6 = PasswordOption(name="secret", doc="the secret", properties=frozenset({"basic", "mandatory", "novalidator"}), informations={'secret_manager': True, 'ymlfiles': ['tests/types/types/family_secret_manager/00-base.yml', 'tests/types/structures/family_secret_manager/00-base.yml'], 'type': 'secret'}) +optiondescription_4 = OptionDescription(name="secret2", doc="Family with secret", children=[option_5, option_6], properties=frozenset({"basic"}), informations={'ymlfiles': ['tests/types/types/family_secret_manager/00-base.yml', 'tests/types/structures/family_secret_manager/00-base.yml']}) +option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1, optiondescription_4]) diff --git a/tests/types/result/family_secret_manager/variables.json b/tests/types/result/family_secret_manager/variables.json index 6d5792c33..5aed2ce54 100644 --- a/tests/types/result/family_secret_manager/variables.json +++ b/tests/types/result/family_secret_manager/variables.json @@ -1,6 +1,6 @@ { - "ns2.secret1.a_variable": "my_value", - "ns2.secret1.secret": null, - "ns2.secret2.a_variable": "my_value", - "ns2.secret2.secret": null + "secret1.a_variable": "my_value", + "secret1.secret": null, + "secret2.a_variable": "my_value", + "secret2.secret": null } \ No newline at end of file diff --git a/tests/types/result/family_secret_manager/variables_rw.json b/tests/types/result/family_secret_manager/variables_rw.json index 6d5792c33..5aed2ce54 100644 --- a/tests/types/result/family_secret_manager/variables_rw.json +++ b/tests/types/result/family_secret_manager/variables_rw.json @@ -1,6 +1,6 @@ { - "ns2.secret1.a_variable": "my_value", - "ns2.secret1.secret": null, - "ns2.secret2.a_variable": "my_value", - "ns2.secret2.secret": null + "secret1.a_variable": "my_value", + "secret1.secret": null, + "secret2.a_variable": "my_value", + "secret2.secret": null } \ No newline at end of file diff --git a/tests/types/result/family_subfamily/namespace_tiramisu.py b/tests/types/result/family_subfamily/namespace_tiramisu.py index e0aa2c522..739b8f60e 100644 --- a/tests/types/result/family_subfamily/namespace_tiramisu.py +++ b/tests/types/result/family_subfamily/namespace_tiramisu.py @@ -9,16 +9,17 @@ except: ALLOWED_LEADER_PROPERTIES.add("basic") ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") -option_2 = StrOption(name="a_first_variable", doc="a first variable", default="a modified value", properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['tests/types/types/family_subfamily/00_structure.yml', 'tests/types/structures/family_subfamily/00_structure.yml'], 'type': 'string'}) -option_4 = StrOption(name="a_second_variable", doc="a second variable", default="a modified value", properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['tests/types/types/family_subfamily/00_structure.yml', 'tests/types/structures/family_subfamily/00_structure.yml'], 'type': 'string'}) -optiondescription_3 = OptionDescription(name="a_sub_family", doc="My subfamily", children=[option_4], properties=frozenset({"standard"}), informations={'ymlfiles': ['tests/types/types/family_subfamily/00_structure.yml', 'tests/types/structures/family_subfamily/00_structure.yml']}) -optiondescription_1 = OptionDescription(name="my_family_1", doc="My family type", children=[option_2, optiondescription_3], properties=frozenset({"standard"}), informations={'ymlfiles': ['tests/types/types/family_subfamily/00_structure.yml', 'tests/types/structures/family_subfamily/00_structure.yml']}) -option_6 = StrOption(name="a_first_variable", doc="a first variable", default="a value", properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['tests/types/types/family_subfamily/00_structure.yml', 'tests/types/structures/family_subfamily/00_structure.yml'], 'type': 'string'}) -option_8 = StrOption(name="a_second_variable", doc="a second variable", properties=frozenset({"basic", "mandatory"}), informations={'ymlfiles': ['tests/types/types/family_subfamily/00_structure.yml', 'tests/types/structures/family_subfamily/00_structure.yml'], 'type': 'string'}) -optiondescription_7 = OptionDescription(name="a_sub_family", doc="My subfamily", children=[option_8], properties=frozenset({"basic"}), informations={'ymlfiles': ['tests/types/types/family_subfamily/00_structure.yml', 'tests/types/structures/family_subfamily/00_structure.yml']}) -optiondescription_5 = OptionDescription(name="my_family_2", doc="My family type", children=[option_6, optiondescription_7], properties=frozenset({"basic"}), informations={'ymlfiles': ['tests/types/types/family_subfamily/00_structure.yml', 'tests/types/structures/family_subfamily/00_structure.yml']}) -option_10 = StrOption(name="a_first_variable", doc="a first variable", default="a value", properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['tests/types/types/family_subfamily/00_structure.yml', 'tests/types/structures/family_subfamily/00_structure.yml'], 'type': 'string'}) -option_12 = StrOption(name="a_second_variable", doc="a second variable", default="a modified value 2", properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['tests/types/types/family_subfamily/00_structure.yml', 'tests/types/structures/family_subfamily/00_structure.yml'], 'type': 'string'}) -optiondescription_11 = OptionDescription(name="a_sub_family", doc="My subfamily", children=[option_12], properties=frozenset({"standard"}), informations={'ymlfiles': ['tests/types/types/family_subfamily/00_structure.yml', 'tests/types/structures/family_subfamily/00_structure.yml']}) -optiondescription_9 = OptionDescription(name="my_family_3", doc="My family type", children=[option_10, optiondescription_11], properties=frozenset({"standard"}), informations={'ymlfiles': ['tests/types/types/family_subfamily/00_structure.yml', 'tests/types/structures/family_subfamily/00_structure.yml']}) -option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1, optiondescription_5, optiondescription_9]) +option_4 = StrOption(name="a_first_variable", doc="a first variable", default="a modified value", properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['tests/types/types/family_subfamily/00_structure.yml', 'tests/types/structures/family_subfamily/00_structure.yml'], 'type': 'string'}) +option_6 = StrOption(name="a_second_variable", doc="a second variable", default="a modified value", properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['tests/types/types/family_subfamily/00_structure.yml', 'tests/types/structures/family_subfamily/00_structure.yml'], 'type': 'string'}) +optiondescription_5 = OptionDescription(name="a_sub_family", doc="My subfamily", children=[option_6], properties=frozenset({"standard"}), informations={'ymlfiles': ['tests/types/types/family_subfamily/00_structure.yml', 'tests/types/structures/family_subfamily/00_structure.yml']}) +optiondescription_3 = OptionDescription(name="my_family_1", doc="My family type", children=[option_4, optiondescription_5], properties=frozenset({"standard"}), informations={'ymlfiles': ['tests/types/types/family_subfamily/00_structure.yml', 'tests/types/structures/family_subfamily/00_structure.yml']}) +option_8 = StrOption(name="a_first_variable", doc="a first variable", default="a value", properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['tests/types/types/family_subfamily/00_structure.yml', 'tests/types/structures/family_subfamily/00_structure.yml'], 'type': 'string'}) +option_10 = StrOption(name="a_second_variable", doc="a second variable", properties=frozenset({"basic", "mandatory"}), informations={'ymlfiles': ['tests/types/types/family_subfamily/00_structure.yml', 'tests/types/structures/family_subfamily/00_structure.yml'], 'type': 'string'}) +optiondescription_9 = OptionDescription(name="a_sub_family", doc="My subfamily", children=[option_10], properties=frozenset({"basic"}), informations={'ymlfiles': ['tests/types/types/family_subfamily/00_structure.yml', 'tests/types/structures/family_subfamily/00_structure.yml']}) +optiondescription_7 = OptionDescription(name="my_family_2", doc="My family type", children=[option_8, optiondescription_9], properties=frozenset({"basic"}), informations={'ymlfiles': ['tests/types/types/family_subfamily/00_structure.yml', 'tests/types/structures/family_subfamily/00_structure.yml']}) +option_12 = StrOption(name="a_first_variable", doc="a first variable", default="a value", properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['tests/types/types/family_subfamily/00_structure.yml', 'tests/types/structures/family_subfamily/00_structure.yml'], 'type': 'string'}) +option_14 = StrOption(name="a_second_variable", doc="a second variable", default="a modified value 2", properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['tests/types/types/family_subfamily/00_structure.yml', 'tests/types/structures/family_subfamily/00_structure.yml'], 'type': 'string'}) +optiondescription_13 = OptionDescription(name="a_sub_family", doc="My subfamily", children=[option_14], properties=frozenset({"standard"}), informations={'ymlfiles': ['tests/types/types/family_subfamily/00_structure.yml', 'tests/types/structures/family_subfamily/00_structure.yml']}) +optiondescription_11 = OptionDescription(name="my_family_3", doc="My family type", children=[option_12, optiondescription_13], properties=frozenset({"standard"}), informations={'ymlfiles': ['tests/types/types/family_subfamily/00_structure.yml', 'tests/types/structures/family_subfamily/00_structure.yml']}) +optiondescription_2 = OptionDescription(name="ns2", doc="NS2", group_type=groups.namespace, children=[optiondescription_3, optiondescription_7, optiondescription_11], properties=frozenset({"basic"})) +option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_2]) diff --git a/tests/types/result/family_subfamily/namespace_variables.json b/tests/types/result/family_subfamily/namespace_variables.json index aa6723048..e75b73bdf 100644 --- a/tests/types/result/family_subfamily/namespace_variables.json +++ b/tests/types/result/family_subfamily/namespace_variables.json @@ -1,8 +1,8 @@ { - "my_family_1.a_first_variable": "a modified value", - "my_family_1.a_sub_family.a_second_variable": "a modified value", - "my_family_2.a_first_variable": "a value", - "my_family_2.a_sub_family.a_second_variable": null, - "my_family_3.a_first_variable": "a value", - "my_family_3.a_sub_family.a_second_variable": "a modified value 2" + "ns2.my_family_1.a_first_variable": "a modified value", + "ns2.my_family_1.a_sub_family.a_second_variable": "a modified value", + "ns2.my_family_2.a_first_variable": "a value", + "ns2.my_family_2.a_sub_family.a_second_variable": null, + "ns2.my_family_3.a_first_variable": "a value", + "ns2.my_family_3.a_sub_family.a_second_variable": "a modified value 2" } \ No newline at end of file diff --git a/tests/types/result/family_subfamily/namespace_variables_rw.json b/tests/types/result/family_subfamily/namespace_variables_rw.json index aa6723048..e75b73bdf 100644 --- a/tests/types/result/family_subfamily/namespace_variables_rw.json +++ b/tests/types/result/family_subfamily/namespace_variables_rw.json @@ -1,8 +1,8 @@ { - "my_family_1.a_first_variable": "a modified value", - "my_family_1.a_sub_family.a_second_variable": "a modified value", - "my_family_2.a_first_variable": "a value", - "my_family_2.a_sub_family.a_second_variable": null, - "my_family_3.a_first_variable": "a value", - "my_family_3.a_sub_family.a_second_variable": "a modified value 2" + "ns2.my_family_1.a_first_variable": "a modified value", + "ns2.my_family_1.a_sub_family.a_second_variable": "a modified value", + "ns2.my_family_2.a_first_variable": "a value", + "ns2.my_family_2.a_sub_family.a_second_variable": null, + "ns2.my_family_3.a_first_variable": "a value", + "ns2.my_family_3.a_sub_family.a_second_variable": "a modified value 2" } \ No newline at end of file diff --git a/tests/types/result/family_subfamily/tiramisu.py b/tests/types/result/family_subfamily/tiramisu.py index 739b8f60e..e0aa2c522 100644 --- a/tests/types/result/family_subfamily/tiramisu.py +++ b/tests/types/result/family_subfamily/tiramisu.py @@ -9,17 +9,16 @@ except: ALLOWED_LEADER_PROPERTIES.add("basic") ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") -option_4 = StrOption(name="a_first_variable", doc="a first variable", default="a modified value", properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['tests/types/types/family_subfamily/00_structure.yml', 'tests/types/structures/family_subfamily/00_structure.yml'], 'type': 'string'}) -option_6 = StrOption(name="a_second_variable", doc="a second variable", default="a modified value", properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['tests/types/types/family_subfamily/00_structure.yml', 'tests/types/structures/family_subfamily/00_structure.yml'], 'type': 'string'}) -optiondescription_5 = OptionDescription(name="a_sub_family", doc="My subfamily", children=[option_6], properties=frozenset({"standard"}), informations={'ymlfiles': ['tests/types/types/family_subfamily/00_structure.yml', 'tests/types/structures/family_subfamily/00_structure.yml']}) -optiondescription_3 = OptionDescription(name="my_family_1", doc="My family type", children=[option_4, optiondescription_5], properties=frozenset({"standard"}), informations={'ymlfiles': ['tests/types/types/family_subfamily/00_structure.yml', 'tests/types/structures/family_subfamily/00_structure.yml']}) -option_8 = StrOption(name="a_first_variable", doc="a first variable", default="a value", properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['tests/types/types/family_subfamily/00_structure.yml', 'tests/types/structures/family_subfamily/00_structure.yml'], 'type': 'string'}) -option_10 = StrOption(name="a_second_variable", doc="a second variable", properties=frozenset({"basic", "mandatory"}), informations={'ymlfiles': ['tests/types/types/family_subfamily/00_structure.yml', 'tests/types/structures/family_subfamily/00_structure.yml'], 'type': 'string'}) -optiondescription_9 = OptionDescription(name="a_sub_family", doc="My subfamily", children=[option_10], properties=frozenset({"basic"}), informations={'ymlfiles': ['tests/types/types/family_subfamily/00_structure.yml', 'tests/types/structures/family_subfamily/00_structure.yml']}) -optiondescription_7 = OptionDescription(name="my_family_2", doc="My family type", children=[option_8, optiondescription_9], properties=frozenset({"basic"}), informations={'ymlfiles': ['tests/types/types/family_subfamily/00_structure.yml', 'tests/types/structures/family_subfamily/00_structure.yml']}) -option_12 = StrOption(name="a_first_variable", doc="a first variable", default="a value", properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['tests/types/types/family_subfamily/00_structure.yml', 'tests/types/structures/family_subfamily/00_structure.yml'], 'type': 'string'}) -option_14 = StrOption(name="a_second_variable", doc="a second variable", default="a modified value 2", properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['tests/types/types/family_subfamily/00_structure.yml', 'tests/types/structures/family_subfamily/00_structure.yml'], 'type': 'string'}) -optiondescription_13 = OptionDescription(name="a_sub_family", doc="My subfamily", children=[option_14], properties=frozenset({"standard"}), informations={'ymlfiles': ['tests/types/types/family_subfamily/00_structure.yml', 'tests/types/structures/family_subfamily/00_structure.yml']}) -optiondescription_11 = OptionDescription(name="my_family_3", doc="My family type", children=[option_12, optiondescription_13], properties=frozenset({"standard"}), informations={'ymlfiles': ['tests/types/types/family_subfamily/00_structure.yml', 'tests/types/structures/family_subfamily/00_structure.yml']}) -optiondescription_2 = OptionDescription(name="ns2", doc="NS2", group_type=groups.namespace, children=[optiondescription_3, optiondescription_7, optiondescription_11], properties=frozenset({"basic"})) -option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_2]) +option_2 = StrOption(name="a_first_variable", doc="a first variable", default="a modified value", properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['tests/types/types/family_subfamily/00_structure.yml', 'tests/types/structures/family_subfamily/00_structure.yml'], 'type': 'string'}) +option_4 = StrOption(name="a_second_variable", doc="a second variable", default="a modified value", properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['tests/types/types/family_subfamily/00_structure.yml', 'tests/types/structures/family_subfamily/00_structure.yml'], 'type': 'string'}) +optiondescription_3 = OptionDescription(name="a_sub_family", doc="My subfamily", children=[option_4], properties=frozenset({"standard"}), informations={'ymlfiles': ['tests/types/types/family_subfamily/00_structure.yml', 'tests/types/structures/family_subfamily/00_structure.yml']}) +optiondescription_1 = OptionDescription(name="my_family_1", doc="My family type", children=[option_2, optiondescription_3], properties=frozenset({"standard"}), informations={'ymlfiles': ['tests/types/types/family_subfamily/00_structure.yml', 'tests/types/structures/family_subfamily/00_structure.yml']}) +option_6 = StrOption(name="a_first_variable", doc="a first variable", default="a value", properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['tests/types/types/family_subfamily/00_structure.yml', 'tests/types/structures/family_subfamily/00_structure.yml'], 'type': 'string'}) +option_8 = StrOption(name="a_second_variable", doc="a second variable", properties=frozenset({"basic", "mandatory"}), informations={'ymlfiles': ['tests/types/types/family_subfamily/00_structure.yml', 'tests/types/structures/family_subfamily/00_structure.yml'], 'type': 'string'}) +optiondescription_7 = OptionDescription(name="a_sub_family", doc="My subfamily", children=[option_8], properties=frozenset({"basic"}), informations={'ymlfiles': ['tests/types/types/family_subfamily/00_structure.yml', 'tests/types/structures/family_subfamily/00_structure.yml']}) +optiondescription_5 = OptionDescription(name="my_family_2", doc="My family type", children=[option_6, optiondescription_7], properties=frozenset({"basic"}), informations={'ymlfiles': ['tests/types/types/family_subfamily/00_structure.yml', 'tests/types/structures/family_subfamily/00_structure.yml']}) +option_10 = StrOption(name="a_first_variable", doc="a first variable", default="a value", properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['tests/types/types/family_subfamily/00_structure.yml', 'tests/types/structures/family_subfamily/00_structure.yml'], 'type': 'string'}) +option_12 = StrOption(name="a_second_variable", doc="a second variable", default="a modified value 2", properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['tests/types/types/family_subfamily/00_structure.yml', 'tests/types/structures/family_subfamily/00_structure.yml'], 'type': 'string'}) +optiondescription_11 = OptionDescription(name="a_sub_family", doc="My subfamily", children=[option_12], properties=frozenset({"standard"}), informations={'ymlfiles': ['tests/types/types/family_subfamily/00_structure.yml', 'tests/types/structures/family_subfamily/00_structure.yml']}) +optiondescription_9 = OptionDescription(name="my_family_3", doc="My family type", children=[option_10, optiondescription_11], properties=frozenset({"standard"}), informations={'ymlfiles': ['tests/types/types/family_subfamily/00_structure.yml', 'tests/types/structures/family_subfamily/00_structure.yml']}) +option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1, optiondescription_5, optiondescription_9]) diff --git a/tests/types/result/family_subfamily/variables.json b/tests/types/result/family_subfamily/variables.json index e75b73bdf..aa6723048 100644 --- a/tests/types/result/family_subfamily/variables.json +++ b/tests/types/result/family_subfamily/variables.json @@ -1,8 +1,8 @@ { - "ns2.my_family_1.a_first_variable": "a modified value", - "ns2.my_family_1.a_sub_family.a_second_variable": "a modified value", - "ns2.my_family_2.a_first_variable": "a value", - "ns2.my_family_2.a_sub_family.a_second_variable": null, - "ns2.my_family_3.a_first_variable": "a value", - "ns2.my_family_3.a_sub_family.a_second_variable": "a modified value 2" + "my_family_1.a_first_variable": "a modified value", + "my_family_1.a_sub_family.a_second_variable": "a modified value", + "my_family_2.a_first_variable": "a value", + "my_family_2.a_sub_family.a_second_variable": null, + "my_family_3.a_first_variable": "a value", + "my_family_3.a_sub_family.a_second_variable": "a modified value 2" } \ No newline at end of file diff --git a/tests/types/result/family_subfamily/variables_rw.json b/tests/types/result/family_subfamily/variables_rw.json index e75b73bdf..aa6723048 100644 --- a/tests/types/result/family_subfamily/variables_rw.json +++ b/tests/types/result/family_subfamily/variables_rw.json @@ -1,8 +1,8 @@ { - "ns2.my_family_1.a_first_variable": "a modified value", - "ns2.my_family_1.a_sub_family.a_second_variable": "a modified value", - "ns2.my_family_2.a_first_variable": "a value", - "ns2.my_family_2.a_sub_family.a_second_variable": null, - "ns2.my_family_3.a_first_variable": "a value", - "ns2.my_family_3.a_sub_family.a_second_variable": "a modified value 2" + "my_family_1.a_first_variable": "a modified value", + "my_family_1.a_sub_family.a_second_variable": "a modified value", + "my_family_2.a_first_variable": "a value", + "my_family_2.a_sub_family.a_second_variable": null, + "my_family_3.a_first_variable": "a value", + "my_family_3.a_sub_family.a_second_variable": "a modified value 2" } \ No newline at end of file diff --git a/tests/types/result/family_subfamily_add/namespace_tiramisu.py b/tests/types/result/family_subfamily_add/namespace_tiramisu.py index 0640f88d1..79ab198e3 100644 --- a/tests/types/result/family_subfamily_add/namespace_tiramisu.py +++ b/tests/types/result/family_subfamily_add/namespace_tiramisu.py @@ -9,19 +9,20 @@ except: ALLOWED_LEADER_PROPERTIES.add("basic") ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") -option_2 = StrOption(name="a_first_variable", doc="a first variable", default="a modified value", properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['tests/types/types/family_subfamily_add/00_structure.yml', 'tests/types/structures/family_subfamily_add/00_structure.yml'], 'type': 'string'}) -option_4 = StrOption(name="a_second_variable", doc="a second variable", default="a modified value", properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['tests/types/types/family_subfamily_add/00_structure.yml', 'tests/types/structures/family_subfamily_add/00_structure.yml'], 'type': 'string'}) -optiondescription_3 = OptionDescription(name="a_sub_family", doc="My subfamily", children=[option_4], properties=frozenset({"standard"}), informations={'ymlfiles': ['tests/types/types/family_subfamily_add/00_structure.yml', 'tests/types/structures/family_subfamily_add/00_structure.yml']}) -option_6 = StrOption(name="a_second_variable", doc="a_second_variable", default="a modified value", properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['tests/types/structures/family_subfamily_add/00_structure.yml'], 'type': 'string'}) -optiondescription_5 = OptionDescription(name="a_new_subfamily", doc="a_new_subfamily", children=[option_6], properties=frozenset({"standard"}), informations={'ymlfiles': ['tests/types/structures/family_subfamily_add/00_structure.yml']}) -optiondescription_1 = OptionDescription(name="my_family_1", doc="My family type", children=[option_2, optiondescription_3, optiondescription_5], properties=frozenset({"standard"}), informations={'ymlfiles': ['tests/types/types/family_subfamily_add/00_structure.yml', 'tests/types/structures/family_subfamily_add/00_structure.yml']}) -option_8 = StrOption(name="a_first_variable", doc="a first variable", default="a value", properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['tests/types/types/family_subfamily_add/00_structure.yml', 'tests/types/structures/family_subfamily_add/00_structure.yml'], 'type': 'string'}) -option_10 = StrOption(name="a_second_variable", doc="a second variable", properties=frozenset({"basic", "mandatory"}), informations={'ymlfiles': ['tests/types/types/family_subfamily_add/00_structure.yml', 'tests/types/structures/family_subfamily_add/00_structure.yml'], 'type': 'string'}) -optiondescription_9 = OptionDescription(name="a_sub_family", doc="My subfamily", children=[option_10], properties=frozenset({"basic"}), informations={'ymlfiles': ['tests/types/types/family_subfamily_add/00_structure.yml', 'tests/types/structures/family_subfamily_add/00_structure.yml']}) -optiondescription_7 = OptionDescription(name="my_family_2", doc="My family type", children=[option_8, optiondescription_9], properties=frozenset({"basic"}), informations={'ymlfiles': ['tests/types/types/family_subfamily_add/00_structure.yml', 'tests/types/structures/family_subfamily_add/00_structure.yml']}) -option_12 = StrOption(name="a_first_variable", doc="a first variable", default="a value", properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['tests/types/types/family_subfamily_add/00_structure.yml', 'tests/types/structures/family_subfamily_add/00_structure.yml'], 'type': 'string'}) -option_13 = StrOption(name="a_new_variable", doc="a_new_variable", default="a modified value", properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['tests/types/structures/family_subfamily_add/00_structure.yml'], 'type': 'string'}) -option_15 = StrOption(name="a_second_variable", doc="a second variable", default="a modified value 2", properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['tests/types/types/family_subfamily_add/00_structure.yml', 'tests/types/structures/family_subfamily_add/00_structure.yml'], 'type': 'string'}) -optiondescription_14 = OptionDescription(name="a_sub_family", doc="My subfamily", children=[option_15], properties=frozenset({"standard"}), informations={'ymlfiles': ['tests/types/types/family_subfamily_add/00_structure.yml', 'tests/types/structures/family_subfamily_add/00_structure.yml']}) -optiondescription_11 = OptionDescription(name="my_family_3", doc="My family type", children=[option_12, option_13, optiondescription_14], properties=frozenset({"standard"}), informations={'ymlfiles': ['tests/types/types/family_subfamily_add/00_structure.yml', 'tests/types/structures/family_subfamily_add/00_structure.yml']}) -option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1, optiondescription_7, optiondescription_11]) +option_4 = StrOption(name="a_first_variable", doc="a first variable", default="a modified value", properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['tests/types/types/family_subfamily_add/00_structure.yml', 'tests/types/structures/family_subfamily_add/00_structure.yml'], 'type': 'string'}) +option_6 = StrOption(name="a_second_variable", doc="a second variable", default="a modified value", properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['tests/types/types/family_subfamily_add/00_structure.yml', 'tests/types/structures/family_subfamily_add/00_structure.yml'], 'type': 'string'}) +optiondescription_5 = OptionDescription(name="a_sub_family", doc="My subfamily", children=[option_6], properties=frozenset({"standard"}), informations={'ymlfiles': ['tests/types/types/family_subfamily_add/00_structure.yml', 'tests/types/structures/family_subfamily_add/00_structure.yml']}) +option_8 = StrOption(name="a_second_variable", doc="a_second_variable", default="a modified value", properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['tests/types/structures/family_subfamily_add/00_structure.yml'], 'type': 'string'}) +optiondescription_7 = OptionDescription(name="a_new_subfamily", doc="a_new_subfamily", children=[option_8], properties=frozenset({"standard"}), informations={'ymlfiles': ['tests/types/structures/family_subfamily_add/00_structure.yml']}) +optiondescription_3 = OptionDescription(name="my_family_1", doc="My family type", children=[option_4, optiondescription_5, optiondescription_7], properties=frozenset({"standard"}), informations={'ymlfiles': ['tests/types/types/family_subfamily_add/00_structure.yml', 'tests/types/structures/family_subfamily_add/00_structure.yml']}) +option_10 = StrOption(name="a_first_variable", doc="a first variable", default="a value", properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['tests/types/types/family_subfamily_add/00_structure.yml', 'tests/types/structures/family_subfamily_add/00_structure.yml'], 'type': 'string'}) +option_12 = StrOption(name="a_second_variable", doc="a second variable", properties=frozenset({"basic", "mandatory"}), informations={'ymlfiles': ['tests/types/types/family_subfamily_add/00_structure.yml', 'tests/types/structures/family_subfamily_add/00_structure.yml'], 'type': 'string'}) +optiondescription_11 = OptionDescription(name="a_sub_family", doc="My subfamily", children=[option_12], properties=frozenset({"basic"}), informations={'ymlfiles': ['tests/types/types/family_subfamily_add/00_structure.yml', 'tests/types/structures/family_subfamily_add/00_structure.yml']}) +optiondescription_9 = OptionDescription(name="my_family_2", doc="My family type", children=[option_10, optiondescription_11], properties=frozenset({"basic"}), informations={'ymlfiles': ['tests/types/types/family_subfamily_add/00_structure.yml', 'tests/types/structures/family_subfamily_add/00_structure.yml']}) +option_14 = StrOption(name="a_first_variable", doc="a first variable", default="a value", properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['tests/types/types/family_subfamily_add/00_structure.yml', 'tests/types/structures/family_subfamily_add/00_structure.yml'], 'type': 'string'}) +option_15 = StrOption(name="a_new_variable", doc="a_new_variable", default="a modified value", properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['tests/types/structures/family_subfamily_add/00_structure.yml'], 'type': 'string'}) +option_17 = StrOption(name="a_second_variable", doc="a second variable", default="a modified value 2", properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['tests/types/types/family_subfamily_add/00_structure.yml', 'tests/types/structures/family_subfamily_add/00_structure.yml'], 'type': 'string'}) +optiondescription_16 = OptionDescription(name="a_sub_family", doc="My subfamily", children=[option_17], properties=frozenset({"standard"}), informations={'ymlfiles': ['tests/types/types/family_subfamily_add/00_structure.yml', 'tests/types/structures/family_subfamily_add/00_structure.yml']}) +optiondescription_13 = OptionDescription(name="my_family_3", doc="My family type", children=[option_14, option_15, optiondescription_16], properties=frozenset({"standard"}), informations={'ymlfiles': ['tests/types/types/family_subfamily_add/00_structure.yml', 'tests/types/structures/family_subfamily_add/00_structure.yml']}) +optiondescription_2 = OptionDescription(name="ns2", doc="NS2", group_type=groups.namespace, children=[optiondescription_3, optiondescription_9, optiondescription_13], properties=frozenset({"basic"})) +option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_2]) diff --git a/tests/types/result/family_subfamily_add/namespace_variables.json b/tests/types/result/family_subfamily_add/namespace_variables.json index 3af804566..39e0a0561 100644 --- a/tests/types/result/family_subfamily_add/namespace_variables.json +++ b/tests/types/result/family_subfamily_add/namespace_variables.json @@ -1,10 +1,10 @@ { - "my_family_1.a_first_variable": "a modified value", - "my_family_1.a_sub_family.a_second_variable": "a modified value", - "my_family_1.a_new_subfamily.a_second_variable": "a modified value", - "my_family_2.a_first_variable": "a value", - "my_family_2.a_sub_family.a_second_variable": null, - "my_family_3.a_first_variable": "a value", - "my_family_3.a_sub_family.a_second_variable": "a modified value 2", - "my_family_3.a_new_variable": "a modified value" + "ns2.my_family_1.a_first_variable": "a modified value", + "ns2.my_family_1.a_sub_family.a_second_variable": "a modified value", + "ns2.my_family_1.a_new_subfamily.a_second_variable": "a modified value", + "ns2.my_family_2.a_first_variable": "a value", + "ns2.my_family_2.a_sub_family.a_second_variable": null, + "ns2.my_family_3.a_first_variable": "a value", + "ns2.my_family_3.a_new_variable": "a modified value", + "ns2.my_family_3.a_sub_family.a_second_variable": "a modified value 2" } \ No newline at end of file diff --git a/tests/types/result/family_subfamily_add/namespace_variables_rw.json b/tests/types/result/family_subfamily_add/namespace_variables_rw.json index 3af804566..39e0a0561 100644 --- a/tests/types/result/family_subfamily_add/namespace_variables_rw.json +++ b/tests/types/result/family_subfamily_add/namespace_variables_rw.json @@ -1,10 +1,10 @@ { - "my_family_1.a_first_variable": "a modified value", - "my_family_1.a_sub_family.a_second_variable": "a modified value", - "my_family_1.a_new_subfamily.a_second_variable": "a modified value", - "my_family_2.a_first_variable": "a value", - "my_family_2.a_sub_family.a_second_variable": null, - "my_family_3.a_first_variable": "a value", - "my_family_3.a_sub_family.a_second_variable": "a modified value 2", - "my_family_3.a_new_variable": "a modified value" + "ns2.my_family_1.a_first_variable": "a modified value", + "ns2.my_family_1.a_sub_family.a_second_variable": "a modified value", + "ns2.my_family_1.a_new_subfamily.a_second_variable": "a modified value", + "ns2.my_family_2.a_first_variable": "a value", + "ns2.my_family_2.a_sub_family.a_second_variable": null, + "ns2.my_family_3.a_first_variable": "a value", + "ns2.my_family_3.a_new_variable": "a modified value", + "ns2.my_family_3.a_sub_family.a_second_variable": "a modified value 2" } \ No newline at end of file diff --git a/tests/types/result/family_subfamily_add/tiramisu.py b/tests/types/result/family_subfamily_add/tiramisu.py index 79ab198e3..0640f88d1 100644 --- a/tests/types/result/family_subfamily_add/tiramisu.py +++ b/tests/types/result/family_subfamily_add/tiramisu.py @@ -9,20 +9,19 @@ except: ALLOWED_LEADER_PROPERTIES.add("basic") ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") -option_4 = StrOption(name="a_first_variable", doc="a first variable", default="a modified value", properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['tests/types/types/family_subfamily_add/00_structure.yml', 'tests/types/structures/family_subfamily_add/00_structure.yml'], 'type': 'string'}) -option_6 = StrOption(name="a_second_variable", doc="a second variable", default="a modified value", properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['tests/types/types/family_subfamily_add/00_structure.yml', 'tests/types/structures/family_subfamily_add/00_structure.yml'], 'type': 'string'}) -optiondescription_5 = OptionDescription(name="a_sub_family", doc="My subfamily", children=[option_6], properties=frozenset({"standard"}), informations={'ymlfiles': ['tests/types/types/family_subfamily_add/00_structure.yml', 'tests/types/structures/family_subfamily_add/00_structure.yml']}) -option_8 = StrOption(name="a_second_variable", doc="a_second_variable", default="a modified value", properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['tests/types/structures/family_subfamily_add/00_structure.yml'], 'type': 'string'}) -optiondescription_7 = OptionDescription(name="a_new_subfamily", doc="a_new_subfamily", children=[option_8], properties=frozenset({"standard"}), informations={'ymlfiles': ['tests/types/structures/family_subfamily_add/00_structure.yml']}) -optiondescription_3 = OptionDescription(name="my_family_1", doc="My family type", children=[option_4, optiondescription_5, optiondescription_7], properties=frozenset({"standard"}), informations={'ymlfiles': ['tests/types/types/family_subfamily_add/00_structure.yml', 'tests/types/structures/family_subfamily_add/00_structure.yml']}) -option_10 = StrOption(name="a_first_variable", doc="a first variable", default="a value", properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['tests/types/types/family_subfamily_add/00_structure.yml', 'tests/types/structures/family_subfamily_add/00_structure.yml'], 'type': 'string'}) -option_12 = StrOption(name="a_second_variable", doc="a second variable", properties=frozenset({"basic", "mandatory"}), informations={'ymlfiles': ['tests/types/types/family_subfamily_add/00_structure.yml', 'tests/types/structures/family_subfamily_add/00_structure.yml'], 'type': 'string'}) -optiondescription_11 = OptionDescription(name="a_sub_family", doc="My subfamily", children=[option_12], properties=frozenset({"basic"}), informations={'ymlfiles': ['tests/types/types/family_subfamily_add/00_structure.yml', 'tests/types/structures/family_subfamily_add/00_structure.yml']}) -optiondescription_9 = OptionDescription(name="my_family_2", doc="My family type", children=[option_10, optiondescription_11], properties=frozenset({"basic"}), informations={'ymlfiles': ['tests/types/types/family_subfamily_add/00_structure.yml', 'tests/types/structures/family_subfamily_add/00_structure.yml']}) -option_14 = StrOption(name="a_first_variable", doc="a first variable", default="a value", properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['tests/types/types/family_subfamily_add/00_structure.yml', 'tests/types/structures/family_subfamily_add/00_structure.yml'], 'type': 'string'}) -option_15 = StrOption(name="a_new_variable", doc="a_new_variable", default="a modified value", properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['tests/types/structures/family_subfamily_add/00_structure.yml'], 'type': 'string'}) -option_17 = StrOption(name="a_second_variable", doc="a second variable", default="a modified value 2", properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['tests/types/types/family_subfamily_add/00_structure.yml', 'tests/types/structures/family_subfamily_add/00_structure.yml'], 'type': 'string'}) -optiondescription_16 = OptionDescription(name="a_sub_family", doc="My subfamily", children=[option_17], properties=frozenset({"standard"}), informations={'ymlfiles': ['tests/types/types/family_subfamily_add/00_structure.yml', 'tests/types/structures/family_subfamily_add/00_structure.yml']}) -optiondescription_13 = OptionDescription(name="my_family_3", doc="My family type", children=[option_14, option_15, optiondescription_16], properties=frozenset({"standard"}), informations={'ymlfiles': ['tests/types/types/family_subfamily_add/00_structure.yml', 'tests/types/structures/family_subfamily_add/00_structure.yml']}) -optiondescription_2 = OptionDescription(name="ns2", doc="NS2", group_type=groups.namespace, children=[optiondescription_3, optiondescription_9, optiondescription_13], properties=frozenset({"basic"})) -option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_2]) +option_2 = StrOption(name="a_first_variable", doc="a first variable", default="a modified value", properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['tests/types/types/family_subfamily_add/00_structure.yml', 'tests/types/structures/family_subfamily_add/00_structure.yml'], 'type': 'string'}) +option_4 = StrOption(name="a_second_variable", doc="a second variable", default="a modified value", properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['tests/types/types/family_subfamily_add/00_structure.yml', 'tests/types/structures/family_subfamily_add/00_structure.yml'], 'type': 'string'}) +optiondescription_3 = OptionDescription(name="a_sub_family", doc="My subfamily", children=[option_4], properties=frozenset({"standard"}), informations={'ymlfiles': ['tests/types/types/family_subfamily_add/00_structure.yml', 'tests/types/structures/family_subfamily_add/00_structure.yml']}) +option_6 = StrOption(name="a_second_variable", doc="a_second_variable", default="a modified value", properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['tests/types/structures/family_subfamily_add/00_structure.yml'], 'type': 'string'}) +optiondescription_5 = OptionDescription(name="a_new_subfamily", doc="a_new_subfamily", children=[option_6], properties=frozenset({"standard"}), informations={'ymlfiles': ['tests/types/structures/family_subfamily_add/00_structure.yml']}) +optiondescription_1 = OptionDescription(name="my_family_1", doc="My family type", children=[option_2, optiondescription_3, optiondescription_5], properties=frozenset({"standard"}), informations={'ymlfiles': ['tests/types/types/family_subfamily_add/00_structure.yml', 'tests/types/structures/family_subfamily_add/00_structure.yml']}) +option_8 = StrOption(name="a_first_variable", doc="a first variable", default="a value", properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['tests/types/types/family_subfamily_add/00_structure.yml', 'tests/types/structures/family_subfamily_add/00_structure.yml'], 'type': 'string'}) +option_10 = StrOption(name="a_second_variable", doc="a second variable", properties=frozenset({"basic", "mandatory"}), informations={'ymlfiles': ['tests/types/types/family_subfamily_add/00_structure.yml', 'tests/types/structures/family_subfamily_add/00_structure.yml'], 'type': 'string'}) +optiondescription_9 = OptionDescription(name="a_sub_family", doc="My subfamily", children=[option_10], properties=frozenset({"basic"}), informations={'ymlfiles': ['tests/types/types/family_subfamily_add/00_structure.yml', 'tests/types/structures/family_subfamily_add/00_structure.yml']}) +optiondescription_7 = OptionDescription(name="my_family_2", doc="My family type", children=[option_8, optiondescription_9], properties=frozenset({"basic"}), informations={'ymlfiles': ['tests/types/types/family_subfamily_add/00_structure.yml', 'tests/types/structures/family_subfamily_add/00_structure.yml']}) +option_12 = StrOption(name="a_first_variable", doc="a first variable", default="a value", properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['tests/types/types/family_subfamily_add/00_structure.yml', 'tests/types/structures/family_subfamily_add/00_structure.yml'], 'type': 'string'}) +option_13 = StrOption(name="a_new_variable", doc="a_new_variable", default="a modified value", properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['tests/types/structures/family_subfamily_add/00_structure.yml'], 'type': 'string'}) +option_15 = StrOption(name="a_second_variable", doc="a second variable", default="a modified value 2", properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['tests/types/types/family_subfamily_add/00_structure.yml', 'tests/types/structures/family_subfamily_add/00_structure.yml'], 'type': 'string'}) +optiondescription_14 = OptionDescription(name="a_sub_family", doc="My subfamily", children=[option_15], properties=frozenset({"standard"}), informations={'ymlfiles': ['tests/types/types/family_subfamily_add/00_structure.yml', 'tests/types/structures/family_subfamily_add/00_structure.yml']}) +optiondescription_11 = OptionDescription(name="my_family_3", doc="My family type", children=[option_12, option_13, optiondescription_14], properties=frozenset({"standard"}), informations={'ymlfiles': ['tests/types/types/family_subfamily_add/00_structure.yml', 'tests/types/structures/family_subfamily_add/00_structure.yml']}) +option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1, optiondescription_7, optiondescription_11]) diff --git a/tests/types/result/family_subfamily_add/variables.json b/tests/types/result/family_subfamily_add/variables.json index c6cc8e190..40a14e3d2 100644 --- a/tests/types/result/family_subfamily_add/variables.json +++ b/tests/types/result/family_subfamily_add/variables.json @@ -1,10 +1,10 @@ { - "ns2.my_family_1.a_first_variable": "a modified value", - "ns2.my_family_1.a_sub_family.a_second_variable": "a modified value", - "ns2.my_family_1.a_new_subfamily.a_second_variable": "a modified value", - "ns2.my_family_2.a_first_variable": "a value", - "ns2.my_family_2.a_sub_family.a_second_variable": null, - "ns2.my_family_3.a_first_variable": "a value", - "ns2.my_family_3.a_sub_family.a_second_variable": "a modified value 2", - "ns2.my_family_3.a_new_variable": "a modified value" + "my_family_1.a_first_variable": "a modified value", + "my_family_1.a_sub_family.a_second_variable": "a modified value", + "my_family_1.a_new_subfamily.a_second_variable": "a modified value", + "my_family_2.a_first_variable": "a value", + "my_family_2.a_sub_family.a_second_variable": null, + "my_family_3.a_first_variable": "a value", + "my_family_3.a_new_variable": "a modified value", + "my_family_3.a_sub_family.a_second_variable": "a modified value 2" } \ No newline at end of file diff --git a/tests/types/result/family_subfamily_add/variables_rw.json b/tests/types/result/family_subfamily_add/variables_rw.json index c6cc8e190..40a14e3d2 100644 --- a/tests/types/result/family_subfamily_add/variables_rw.json +++ b/tests/types/result/family_subfamily_add/variables_rw.json @@ -1,10 +1,10 @@ { - "ns2.my_family_1.a_first_variable": "a modified value", - "ns2.my_family_1.a_sub_family.a_second_variable": "a modified value", - "ns2.my_family_1.a_new_subfamily.a_second_variable": "a modified value", - "ns2.my_family_2.a_first_variable": "a value", - "ns2.my_family_2.a_sub_family.a_second_variable": null, - "ns2.my_family_3.a_first_variable": "a value", - "ns2.my_family_3.a_sub_family.a_second_variable": "a modified value 2", - "ns2.my_family_3.a_new_variable": "a modified value" + "my_family_1.a_first_variable": "a modified value", + "my_family_1.a_sub_family.a_second_variable": "a modified value", + "my_family_1.a_new_subfamily.a_second_variable": "a modified value", + "my_family_2.a_first_variable": "a value", + "my_family_2.a_sub_family.a_second_variable": null, + "my_family_3.a_first_variable": "a value", + "my_family_3.a_new_variable": "a modified value", + "my_family_3.a_sub_family.a_second_variable": "a modified value 2" } \ No newline at end of file diff --git a/tests/types/result/leadership/namespace_tiramisu.py b/tests/types/result/leadership/namespace_tiramisu.py index 18058e149..5a9e3587b 100644 --- a/tests/types/result/leadership/namespace_tiramisu.py +++ b/tests/types/result/leadership/namespace_tiramisu.py @@ -9,25 +9,26 @@ except: ALLOWED_LEADER_PROPERTIES.add("basic") ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") -option_3 = StrOption(name="a_leader", doc="My first variable", multi=True, default=["a value"], properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['tests/types/types/leadership/00_type.yml', 'tests/types/structures/leadership/00_structure.yml'], 'type': 'string'}) -option_4 = StrOption(name="a_first_follower", doc="My second variable", multi=True, default_multi="an other value", properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['tests/types/types/leadership/00_type.yml', 'tests/types/structures/leadership/00_structure.yml'], 'type': 'string'}) -option_5 = StrOption(name="a_second_follower", doc="My third variable", multi=True, default_multi="again an other value", properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['tests/types/types/leadership/00_type.yml', 'tests/types/structures/leadership/00_structure.yml'], 'type': 'string'}) -optiondescription_2 = Leadership(name="my_leadership", doc="my_leadership", children=[option_3, option_4, option_5], properties=frozenset({"standard"}), informations={'ymlfiles': ['tests/types/types/leadership/00_type.yml', 'tests/types/structures/leadership/00_structure.yml']}) -optiondescription_1 = OptionDescription(name="my_leadership_1", doc="My family type", children=[optiondescription_2], properties=frozenset({"standard"}), informations={'ymlfiles': ['tests/types/types/leadership/00_type.yml', 'tests/types/structures/leadership/00_structure.yml']}) -option_8 = StrOption(name="a_leader", doc="My first variable", multi=True, default=["a value"], properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['tests/types/types/leadership/00_type.yml', 'tests/types/structures/leadership/00_structure.yml'], 'type': 'string'}) -option_9 = StrOption(name="a_first_follower", doc="My second variable", multi=True, default_multi="a modified value", properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['tests/types/types/leadership/00_type.yml', 'tests/types/structures/leadership/00_structure.yml'], 'type': 'string'}) -option_10 = StrOption(name="a_second_follower", doc="My third variable", multi=True, default_multi="again an other value", properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['tests/types/types/leadership/00_type.yml', 'tests/types/structures/leadership/00_structure.yml'], 'type': 'string'}) -optiondescription_7 = Leadership(name="my_leadership", doc="my_leadership", children=[option_8, option_9, option_10], properties=frozenset({"standard"}), informations={'ymlfiles': ['tests/types/types/leadership/00_type.yml', 'tests/types/structures/leadership/00_structure.yml']}) -optiondescription_6 = OptionDescription(name="my_leadership_2", doc="My family type", children=[optiondescription_7], properties=frozenset({"standard"}), informations={'ymlfiles': ['tests/types/types/leadership/00_type.yml', 'tests/types/structures/leadership/00_structure.yml']}) -option_13 = StrOption(name="a_leader", doc="My first variable", multi=True, default=["a value"], properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['tests/types/types/leadership/00_type.yml', 'tests/types/structures/leadership/00_structure.yml'], 'type': 'string'}) -option_14 = StrOption(name="a_first_follower", doc="My second variable", multi=True, default_multi="an other value", properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['tests/types/types/leadership/00_type.yml', 'tests/types/structures/leadership/00_structure.yml'], 'type': 'string'}) -option_15 = StrOption(name="a_second_follower", doc="My third variable", multi=True, default_multi="again an other value", properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['tests/types/types/leadership/00_type.yml', 'tests/types/structures/leadership/00_structure.yml'], 'type': 'string'}) -option_16 = StrOption(name="a_new_follower", doc="a description", multi=True, default_multi="a value", properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['tests/types/structures/leadership/00_structure.yml'], 'type': 'string'}) -optiondescription_12 = Leadership(name="my_leadership", doc="my_leadership", children=[option_13, option_14, option_15, option_16], properties=frozenset({"standard"}), informations={'ymlfiles': ['tests/types/types/leadership/00_type.yml', 'tests/types/structures/leadership/00_structure.yml']}) -optiondescription_11 = OptionDescription(name="my_leadership_3", doc="My family type", children=[optiondescription_12], properties=frozenset({"standard"}), informations={'ymlfiles': ['tests/types/types/leadership/00_type.yml', 'tests/types/structures/leadership/00_structure.yml']}) -option_19 = StrOption(name="a_leader", doc="a description", multi=True, default=["a value leader", "a second leader"], properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['tests/types/types/leadership/00_type.yml', 'tests/types/structures/leadership/00_structure.yml'], 'type': 'string'}) -option_20 = StrOption(name="a_first_follower", doc="My second variable", multi=True, default_multi="an other value", properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['tests/types/types/leadership/00_type.yml', 'tests/types/structures/leadership/00_structure.yml'], 'type': 'string'}) -option_21 = StrOption(name="a_second_follower", doc="My third variable", multi=True, default_multi="again an other value", properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['tests/types/types/leadership/00_type.yml', 'tests/types/structures/leadership/00_structure.yml'], 'type': 'string'}) -optiondescription_18 = Leadership(name="my_leadership", doc="my_leadership", children=[option_19, option_20, option_21], properties=frozenset({"standard"}), informations={'ymlfiles': ['tests/types/types/leadership/00_type.yml', 'tests/types/structures/leadership/00_structure.yml']}) -optiondescription_17 = OptionDescription(name="my_leadership_4", doc="My family type", children=[optiondescription_18], properties=frozenset({"standard"}), informations={'ymlfiles': ['tests/types/types/leadership/00_type.yml', 'tests/types/structures/leadership/00_structure.yml']}) -option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1, optiondescription_6, optiondescription_11, optiondescription_17]) +option_5 = StrOption(name="a_leader", doc="My first variable", multi=True, default=["a value"], properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['tests/types/types/leadership/00_type.yml', 'tests/types/structures/leadership/00_structure.yml'], 'type': 'string'}) +option_6 = StrOption(name="a_first_follower", doc="My second variable", multi=True, default_multi="an other value", properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['tests/types/types/leadership/00_type.yml', 'tests/types/structures/leadership/00_structure.yml'], 'type': 'string'}) +option_7 = StrOption(name="a_second_follower", doc="My third variable", multi=True, default_multi="again an other value", properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['tests/types/types/leadership/00_type.yml', 'tests/types/structures/leadership/00_structure.yml'], 'type': 'string'}) +optiondescription_4 = Leadership(name="my_leadership", doc="my_leadership", children=[option_5, option_6, option_7], properties=frozenset({"standard"}), informations={'ymlfiles': ['tests/types/types/leadership/00_type.yml', 'tests/types/structures/leadership/00_structure.yml']}) +optiondescription_3 = OptionDescription(name="my_leadership_1", doc="My family type", children=[optiondescription_4], properties=frozenset({"standard"}), informations={'ymlfiles': ['tests/types/types/leadership/00_type.yml', 'tests/types/structures/leadership/00_structure.yml']}) +option_10 = StrOption(name="a_leader", doc="My first variable", multi=True, default=["a value"], properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['tests/types/types/leadership/00_type.yml', 'tests/types/structures/leadership/00_structure.yml'], 'type': 'string'}) +option_11 = StrOption(name="a_first_follower", doc="My second variable", multi=True, default_multi="a modified value", properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['tests/types/types/leadership/00_type.yml', 'tests/types/structures/leadership/00_structure.yml'], 'type': 'string'}) +option_12 = StrOption(name="a_second_follower", doc="My third variable", multi=True, default_multi="again an other value", properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['tests/types/types/leadership/00_type.yml', 'tests/types/structures/leadership/00_structure.yml'], 'type': 'string'}) +optiondescription_9 = Leadership(name="my_leadership", doc="my_leadership", children=[option_10, option_11, option_12], properties=frozenset({"standard"}), informations={'ymlfiles': ['tests/types/types/leadership/00_type.yml', 'tests/types/structures/leadership/00_structure.yml']}) +optiondescription_8 = OptionDescription(name="my_leadership_2", doc="My family type", children=[optiondescription_9], properties=frozenset({"standard"}), informations={'ymlfiles': ['tests/types/types/leadership/00_type.yml', 'tests/types/structures/leadership/00_structure.yml']}) +option_15 = StrOption(name="a_leader", doc="My first variable", multi=True, default=["a value"], properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['tests/types/types/leadership/00_type.yml', 'tests/types/structures/leadership/00_structure.yml'], 'type': 'string'}) +option_16 = StrOption(name="a_first_follower", doc="My second variable", multi=True, default_multi="an other value", properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['tests/types/types/leadership/00_type.yml', 'tests/types/structures/leadership/00_structure.yml'], 'type': 'string'}) +option_17 = StrOption(name="a_second_follower", doc="My third variable", multi=True, default_multi="again an other value", properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['tests/types/types/leadership/00_type.yml', 'tests/types/structures/leadership/00_structure.yml'], 'type': 'string'}) +option_18 = StrOption(name="a_new_follower", doc="a description", multi=True, default_multi="a value", properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['tests/types/structures/leadership/00_structure.yml'], 'type': 'string'}) +optiondescription_14 = Leadership(name="my_leadership", doc="my_leadership", children=[option_15, option_16, option_17, option_18], properties=frozenset({"standard"}), informations={'ymlfiles': ['tests/types/types/leadership/00_type.yml', 'tests/types/structures/leadership/00_structure.yml']}) +optiondescription_13 = OptionDescription(name="my_leadership_3", doc="My family type", children=[optiondescription_14], properties=frozenset({"standard"}), informations={'ymlfiles': ['tests/types/types/leadership/00_type.yml', 'tests/types/structures/leadership/00_structure.yml']}) +option_21 = StrOption(name="a_leader", doc="a description", multi=True, default=["a value leader", "a second leader"], properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['tests/types/types/leadership/00_type.yml', 'tests/types/structures/leadership/00_structure.yml'], 'type': 'string'}) +option_22 = StrOption(name="a_first_follower", doc="My second variable", multi=True, default_multi="an other value", properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['tests/types/types/leadership/00_type.yml', 'tests/types/structures/leadership/00_structure.yml'], 'type': 'string'}) +option_23 = StrOption(name="a_second_follower", doc="My third variable", multi=True, default_multi="again an other value", properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['tests/types/types/leadership/00_type.yml', 'tests/types/structures/leadership/00_structure.yml'], 'type': 'string'}) +optiondescription_20 = Leadership(name="my_leadership", doc="my_leadership", children=[option_21, option_22, option_23], properties=frozenset({"standard"}), informations={'ymlfiles': ['tests/types/types/leadership/00_type.yml', 'tests/types/structures/leadership/00_structure.yml']}) +optiondescription_19 = OptionDescription(name="my_leadership_4", doc="My family type", children=[optiondescription_20], properties=frozenset({"standard"}), informations={'ymlfiles': ['tests/types/types/leadership/00_type.yml', 'tests/types/structures/leadership/00_structure.yml']}) +optiondescription_2 = OptionDescription(name="ns2", doc="NS2", group_type=groups.namespace, children=[optiondescription_3, optiondescription_8, optiondescription_13, optiondescription_19], properties=frozenset({"standard"})) +option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_2]) diff --git a/tests/types/result/leadership/namespace_variables.json b/tests/types/result/leadership/namespace_variables.json index 5731c61c4..f6bf4e498 100644 --- a/tests/types/result/leadership/namespace_variables.json +++ b/tests/types/result/leadership/namespace_variables.json @@ -1,36 +1,36 @@ { - "my_leadership_1.my_leadership.a_leader": [ + "ns2.my_leadership_1.my_leadership.a_leader": [ { - "my_leadership_1.my_leadership.a_leader": "a value", - "my_leadership_1.my_leadership.a_first_follower": "an other value", - "my_leadership_1.my_leadership.a_second_follower": "again an other value" + "ns2.my_leadership_1.my_leadership.a_leader": "a value", + "ns2.my_leadership_1.my_leadership.a_first_follower": "an other value", + "ns2.my_leadership_1.my_leadership.a_second_follower": "again an other value" } ], - "my_leadership_2.my_leadership.a_leader": [ + "ns2.my_leadership_2.my_leadership.a_leader": [ { - "my_leadership_2.my_leadership.a_leader": "a value", - "my_leadership_2.my_leadership.a_first_follower": "a modified value", - "my_leadership_2.my_leadership.a_second_follower": "again an other value" + "ns2.my_leadership_2.my_leadership.a_leader": "a value", + "ns2.my_leadership_2.my_leadership.a_first_follower": "a modified value", + "ns2.my_leadership_2.my_leadership.a_second_follower": "again an other value" } ], - "my_leadership_3.my_leadership.a_leader": [ + "ns2.my_leadership_3.my_leadership.a_leader": [ { - "my_leadership_3.my_leadership.a_leader": "a value", - "my_leadership_3.my_leadership.a_first_follower": "an other value", - "my_leadership_3.my_leadership.a_second_follower": "again an other value", - "my_leadership_3.my_leadership.a_new_follower": "a value" + "ns2.my_leadership_3.my_leadership.a_leader": "a value", + "ns2.my_leadership_3.my_leadership.a_first_follower": "an other value", + "ns2.my_leadership_3.my_leadership.a_second_follower": "again an other value", + "ns2.my_leadership_3.my_leadership.a_new_follower": "a value" } ], - "my_leadership_4.my_leadership.a_leader": [ + "ns2.my_leadership_4.my_leadership.a_leader": [ { - "my_leadership_4.my_leadership.a_leader": "a value leader", - "my_leadership_4.my_leadership.a_first_follower": "an other value", - "my_leadership_4.my_leadership.a_second_follower": "again an other value" + "ns2.my_leadership_4.my_leadership.a_leader": "a value leader", + "ns2.my_leadership_4.my_leadership.a_first_follower": "an other value", + "ns2.my_leadership_4.my_leadership.a_second_follower": "again an other value" }, { - "my_leadership_4.my_leadership.a_leader": "a second leader", - "my_leadership_4.my_leadership.a_first_follower": "an other value", - "my_leadership_4.my_leadership.a_second_follower": "again an other value" + "ns2.my_leadership_4.my_leadership.a_leader": "a second leader", + "ns2.my_leadership_4.my_leadership.a_first_follower": "an other value", + "ns2.my_leadership_4.my_leadership.a_second_follower": "again an other value" } ] } \ No newline at end of file diff --git a/tests/types/result/leadership/namespace_variables_rw.json b/tests/types/result/leadership/namespace_variables_rw.json index 5731c61c4..f6bf4e498 100644 --- a/tests/types/result/leadership/namespace_variables_rw.json +++ b/tests/types/result/leadership/namespace_variables_rw.json @@ -1,36 +1,36 @@ { - "my_leadership_1.my_leadership.a_leader": [ + "ns2.my_leadership_1.my_leadership.a_leader": [ { - "my_leadership_1.my_leadership.a_leader": "a value", - "my_leadership_1.my_leadership.a_first_follower": "an other value", - "my_leadership_1.my_leadership.a_second_follower": "again an other value" + "ns2.my_leadership_1.my_leadership.a_leader": "a value", + "ns2.my_leadership_1.my_leadership.a_first_follower": "an other value", + "ns2.my_leadership_1.my_leadership.a_second_follower": "again an other value" } ], - "my_leadership_2.my_leadership.a_leader": [ + "ns2.my_leadership_2.my_leadership.a_leader": [ { - "my_leadership_2.my_leadership.a_leader": "a value", - "my_leadership_2.my_leadership.a_first_follower": "a modified value", - "my_leadership_2.my_leadership.a_second_follower": "again an other value" + "ns2.my_leadership_2.my_leadership.a_leader": "a value", + "ns2.my_leadership_2.my_leadership.a_first_follower": "a modified value", + "ns2.my_leadership_2.my_leadership.a_second_follower": "again an other value" } ], - "my_leadership_3.my_leadership.a_leader": [ + "ns2.my_leadership_3.my_leadership.a_leader": [ { - "my_leadership_3.my_leadership.a_leader": "a value", - "my_leadership_3.my_leadership.a_first_follower": "an other value", - "my_leadership_3.my_leadership.a_second_follower": "again an other value", - "my_leadership_3.my_leadership.a_new_follower": "a value" + "ns2.my_leadership_3.my_leadership.a_leader": "a value", + "ns2.my_leadership_3.my_leadership.a_first_follower": "an other value", + "ns2.my_leadership_3.my_leadership.a_second_follower": "again an other value", + "ns2.my_leadership_3.my_leadership.a_new_follower": "a value" } ], - "my_leadership_4.my_leadership.a_leader": [ + "ns2.my_leadership_4.my_leadership.a_leader": [ { - "my_leadership_4.my_leadership.a_leader": "a value leader", - "my_leadership_4.my_leadership.a_first_follower": "an other value", - "my_leadership_4.my_leadership.a_second_follower": "again an other value" + "ns2.my_leadership_4.my_leadership.a_leader": "a value leader", + "ns2.my_leadership_4.my_leadership.a_first_follower": "an other value", + "ns2.my_leadership_4.my_leadership.a_second_follower": "again an other value" }, { - "my_leadership_4.my_leadership.a_leader": "a second leader", - "my_leadership_4.my_leadership.a_first_follower": "an other value", - "my_leadership_4.my_leadership.a_second_follower": "again an other value" + "ns2.my_leadership_4.my_leadership.a_leader": "a second leader", + "ns2.my_leadership_4.my_leadership.a_first_follower": "an other value", + "ns2.my_leadership_4.my_leadership.a_second_follower": "again an other value" } ] } \ No newline at end of file diff --git a/tests/types/result/leadership/tiramisu.py b/tests/types/result/leadership/tiramisu.py index 5a9e3587b..18058e149 100644 --- a/tests/types/result/leadership/tiramisu.py +++ b/tests/types/result/leadership/tiramisu.py @@ -9,26 +9,25 @@ except: ALLOWED_LEADER_PROPERTIES.add("basic") ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") -option_5 = StrOption(name="a_leader", doc="My first variable", multi=True, default=["a value"], properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['tests/types/types/leadership/00_type.yml', 'tests/types/structures/leadership/00_structure.yml'], 'type': 'string'}) -option_6 = StrOption(name="a_first_follower", doc="My second variable", multi=True, default_multi="an other value", properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['tests/types/types/leadership/00_type.yml', 'tests/types/structures/leadership/00_structure.yml'], 'type': 'string'}) -option_7 = StrOption(name="a_second_follower", doc="My third variable", multi=True, default_multi="again an other value", properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['tests/types/types/leadership/00_type.yml', 'tests/types/structures/leadership/00_structure.yml'], 'type': 'string'}) -optiondescription_4 = Leadership(name="my_leadership", doc="my_leadership", children=[option_5, option_6, option_7], properties=frozenset({"standard"}), informations={'ymlfiles': ['tests/types/types/leadership/00_type.yml', 'tests/types/structures/leadership/00_structure.yml']}) -optiondescription_3 = OptionDescription(name="my_leadership_1", doc="My family type", children=[optiondescription_4], properties=frozenset({"standard"}), informations={'ymlfiles': ['tests/types/types/leadership/00_type.yml', 'tests/types/structures/leadership/00_structure.yml']}) -option_10 = StrOption(name="a_leader", doc="My first variable", multi=True, default=["a value"], properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['tests/types/types/leadership/00_type.yml', 'tests/types/structures/leadership/00_structure.yml'], 'type': 'string'}) -option_11 = StrOption(name="a_first_follower", doc="My second variable", multi=True, default_multi="a modified value", properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['tests/types/types/leadership/00_type.yml', 'tests/types/structures/leadership/00_structure.yml'], 'type': 'string'}) -option_12 = StrOption(name="a_second_follower", doc="My third variable", multi=True, default_multi="again an other value", properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['tests/types/types/leadership/00_type.yml', 'tests/types/structures/leadership/00_structure.yml'], 'type': 'string'}) -optiondescription_9 = Leadership(name="my_leadership", doc="my_leadership", children=[option_10, option_11, option_12], properties=frozenset({"standard"}), informations={'ymlfiles': ['tests/types/types/leadership/00_type.yml', 'tests/types/structures/leadership/00_structure.yml']}) -optiondescription_8 = OptionDescription(name="my_leadership_2", doc="My family type", children=[optiondescription_9], properties=frozenset({"standard"}), informations={'ymlfiles': ['tests/types/types/leadership/00_type.yml', 'tests/types/structures/leadership/00_structure.yml']}) -option_15 = StrOption(name="a_leader", doc="My first variable", multi=True, default=["a value"], properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['tests/types/types/leadership/00_type.yml', 'tests/types/structures/leadership/00_structure.yml'], 'type': 'string'}) -option_16 = StrOption(name="a_first_follower", doc="My second variable", multi=True, default_multi="an other value", properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['tests/types/types/leadership/00_type.yml', 'tests/types/structures/leadership/00_structure.yml'], 'type': 'string'}) -option_17 = StrOption(name="a_second_follower", doc="My third variable", multi=True, default_multi="again an other value", properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['tests/types/types/leadership/00_type.yml', 'tests/types/structures/leadership/00_structure.yml'], 'type': 'string'}) -option_18 = StrOption(name="a_new_follower", doc="a description", multi=True, default_multi="a value", properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['tests/types/structures/leadership/00_structure.yml'], 'type': 'string'}) -optiondescription_14 = Leadership(name="my_leadership", doc="my_leadership", children=[option_15, option_16, option_17, option_18], properties=frozenset({"standard"}), informations={'ymlfiles': ['tests/types/types/leadership/00_type.yml', 'tests/types/structures/leadership/00_structure.yml']}) -optiondescription_13 = OptionDescription(name="my_leadership_3", doc="My family type", children=[optiondescription_14], properties=frozenset({"standard"}), informations={'ymlfiles': ['tests/types/types/leadership/00_type.yml', 'tests/types/structures/leadership/00_structure.yml']}) -option_21 = StrOption(name="a_leader", doc="a description", multi=True, default=["a value leader", "a second leader"], properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['tests/types/types/leadership/00_type.yml', 'tests/types/structures/leadership/00_structure.yml'], 'type': 'string'}) -option_22 = StrOption(name="a_first_follower", doc="My second variable", multi=True, default_multi="an other value", properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['tests/types/types/leadership/00_type.yml', 'tests/types/structures/leadership/00_structure.yml'], 'type': 'string'}) -option_23 = StrOption(name="a_second_follower", doc="My third variable", multi=True, default_multi="again an other value", properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['tests/types/types/leadership/00_type.yml', 'tests/types/structures/leadership/00_structure.yml'], 'type': 'string'}) -optiondescription_20 = Leadership(name="my_leadership", doc="my_leadership", children=[option_21, option_22, option_23], properties=frozenset({"standard"}), informations={'ymlfiles': ['tests/types/types/leadership/00_type.yml', 'tests/types/structures/leadership/00_structure.yml']}) -optiondescription_19 = OptionDescription(name="my_leadership_4", doc="My family type", children=[optiondescription_20], properties=frozenset({"standard"}), informations={'ymlfiles': ['tests/types/types/leadership/00_type.yml', 'tests/types/structures/leadership/00_structure.yml']}) -optiondescription_2 = OptionDescription(name="ns2", doc="NS2", group_type=groups.namespace, children=[optiondescription_3, optiondescription_8, optiondescription_13, optiondescription_19], properties=frozenset({"standard"})) -option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_2]) +option_3 = StrOption(name="a_leader", doc="My first variable", multi=True, default=["a value"], properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['tests/types/types/leadership/00_type.yml', 'tests/types/structures/leadership/00_structure.yml'], 'type': 'string'}) +option_4 = StrOption(name="a_first_follower", doc="My second variable", multi=True, default_multi="an other value", properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['tests/types/types/leadership/00_type.yml', 'tests/types/structures/leadership/00_structure.yml'], 'type': 'string'}) +option_5 = StrOption(name="a_second_follower", doc="My third variable", multi=True, default_multi="again an other value", properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['tests/types/types/leadership/00_type.yml', 'tests/types/structures/leadership/00_structure.yml'], 'type': 'string'}) +optiondescription_2 = Leadership(name="my_leadership", doc="my_leadership", children=[option_3, option_4, option_5], properties=frozenset({"standard"}), informations={'ymlfiles': ['tests/types/types/leadership/00_type.yml', 'tests/types/structures/leadership/00_structure.yml']}) +optiondescription_1 = OptionDescription(name="my_leadership_1", doc="My family type", children=[optiondescription_2], properties=frozenset({"standard"}), informations={'ymlfiles': ['tests/types/types/leadership/00_type.yml', 'tests/types/structures/leadership/00_structure.yml']}) +option_8 = StrOption(name="a_leader", doc="My first variable", multi=True, default=["a value"], properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['tests/types/types/leadership/00_type.yml', 'tests/types/structures/leadership/00_structure.yml'], 'type': 'string'}) +option_9 = StrOption(name="a_first_follower", doc="My second variable", multi=True, default_multi="a modified value", properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['tests/types/types/leadership/00_type.yml', 'tests/types/structures/leadership/00_structure.yml'], 'type': 'string'}) +option_10 = StrOption(name="a_second_follower", doc="My third variable", multi=True, default_multi="again an other value", properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['tests/types/types/leadership/00_type.yml', 'tests/types/structures/leadership/00_structure.yml'], 'type': 'string'}) +optiondescription_7 = Leadership(name="my_leadership", doc="my_leadership", children=[option_8, option_9, option_10], properties=frozenset({"standard"}), informations={'ymlfiles': ['tests/types/types/leadership/00_type.yml', 'tests/types/structures/leadership/00_structure.yml']}) +optiondescription_6 = OptionDescription(name="my_leadership_2", doc="My family type", children=[optiondescription_7], properties=frozenset({"standard"}), informations={'ymlfiles': ['tests/types/types/leadership/00_type.yml', 'tests/types/structures/leadership/00_structure.yml']}) +option_13 = StrOption(name="a_leader", doc="My first variable", multi=True, default=["a value"], properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['tests/types/types/leadership/00_type.yml', 'tests/types/structures/leadership/00_structure.yml'], 'type': 'string'}) +option_14 = StrOption(name="a_first_follower", doc="My second variable", multi=True, default_multi="an other value", properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['tests/types/types/leadership/00_type.yml', 'tests/types/structures/leadership/00_structure.yml'], 'type': 'string'}) +option_15 = StrOption(name="a_second_follower", doc="My third variable", multi=True, default_multi="again an other value", properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['tests/types/types/leadership/00_type.yml', 'tests/types/structures/leadership/00_structure.yml'], 'type': 'string'}) +option_16 = StrOption(name="a_new_follower", doc="a description", multi=True, default_multi="a value", properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['tests/types/structures/leadership/00_structure.yml'], 'type': 'string'}) +optiondescription_12 = Leadership(name="my_leadership", doc="my_leadership", children=[option_13, option_14, option_15, option_16], properties=frozenset({"standard"}), informations={'ymlfiles': ['tests/types/types/leadership/00_type.yml', 'tests/types/structures/leadership/00_structure.yml']}) +optiondescription_11 = OptionDescription(name="my_leadership_3", doc="My family type", children=[optiondescription_12], properties=frozenset({"standard"}), informations={'ymlfiles': ['tests/types/types/leadership/00_type.yml', 'tests/types/structures/leadership/00_structure.yml']}) +option_19 = StrOption(name="a_leader", doc="a description", multi=True, default=["a value leader", "a second leader"], properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['tests/types/types/leadership/00_type.yml', 'tests/types/structures/leadership/00_structure.yml'], 'type': 'string'}) +option_20 = StrOption(name="a_first_follower", doc="My second variable", multi=True, default_multi="an other value", properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['tests/types/types/leadership/00_type.yml', 'tests/types/structures/leadership/00_structure.yml'], 'type': 'string'}) +option_21 = StrOption(name="a_second_follower", doc="My third variable", multi=True, default_multi="again an other value", properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['tests/types/types/leadership/00_type.yml', 'tests/types/structures/leadership/00_structure.yml'], 'type': 'string'}) +optiondescription_18 = Leadership(name="my_leadership", doc="my_leadership", children=[option_19, option_20, option_21], properties=frozenset({"standard"}), informations={'ymlfiles': ['tests/types/types/leadership/00_type.yml', 'tests/types/structures/leadership/00_structure.yml']}) +optiondescription_17 = OptionDescription(name="my_leadership_4", doc="My family type", children=[optiondescription_18], properties=frozenset({"standard"}), informations={'ymlfiles': ['tests/types/types/leadership/00_type.yml', 'tests/types/structures/leadership/00_structure.yml']}) +option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1, optiondescription_6, optiondescription_11, optiondescription_17]) diff --git a/tests/types/result/leadership/variables.json b/tests/types/result/leadership/variables.json index f6bf4e498..5731c61c4 100644 --- a/tests/types/result/leadership/variables.json +++ b/tests/types/result/leadership/variables.json @@ -1,36 +1,36 @@ { - "ns2.my_leadership_1.my_leadership.a_leader": [ + "my_leadership_1.my_leadership.a_leader": [ { - "ns2.my_leadership_1.my_leadership.a_leader": "a value", - "ns2.my_leadership_1.my_leadership.a_first_follower": "an other value", - "ns2.my_leadership_1.my_leadership.a_second_follower": "again an other value" + "my_leadership_1.my_leadership.a_leader": "a value", + "my_leadership_1.my_leadership.a_first_follower": "an other value", + "my_leadership_1.my_leadership.a_second_follower": "again an other value" } ], - "ns2.my_leadership_2.my_leadership.a_leader": [ + "my_leadership_2.my_leadership.a_leader": [ { - "ns2.my_leadership_2.my_leadership.a_leader": "a value", - "ns2.my_leadership_2.my_leadership.a_first_follower": "a modified value", - "ns2.my_leadership_2.my_leadership.a_second_follower": "again an other value" + "my_leadership_2.my_leadership.a_leader": "a value", + "my_leadership_2.my_leadership.a_first_follower": "a modified value", + "my_leadership_2.my_leadership.a_second_follower": "again an other value" } ], - "ns2.my_leadership_3.my_leadership.a_leader": [ + "my_leadership_3.my_leadership.a_leader": [ { - "ns2.my_leadership_3.my_leadership.a_leader": "a value", - "ns2.my_leadership_3.my_leadership.a_first_follower": "an other value", - "ns2.my_leadership_3.my_leadership.a_second_follower": "again an other value", - "ns2.my_leadership_3.my_leadership.a_new_follower": "a value" + "my_leadership_3.my_leadership.a_leader": "a value", + "my_leadership_3.my_leadership.a_first_follower": "an other value", + "my_leadership_3.my_leadership.a_second_follower": "again an other value", + "my_leadership_3.my_leadership.a_new_follower": "a value" } ], - "ns2.my_leadership_4.my_leadership.a_leader": [ + "my_leadership_4.my_leadership.a_leader": [ { - "ns2.my_leadership_4.my_leadership.a_leader": "a value leader", - "ns2.my_leadership_4.my_leadership.a_first_follower": "an other value", - "ns2.my_leadership_4.my_leadership.a_second_follower": "again an other value" + "my_leadership_4.my_leadership.a_leader": "a value leader", + "my_leadership_4.my_leadership.a_first_follower": "an other value", + "my_leadership_4.my_leadership.a_second_follower": "again an other value" }, { - "ns2.my_leadership_4.my_leadership.a_leader": "a second leader", - "ns2.my_leadership_4.my_leadership.a_first_follower": "an other value", - "ns2.my_leadership_4.my_leadership.a_second_follower": "again an other value" + "my_leadership_4.my_leadership.a_leader": "a second leader", + "my_leadership_4.my_leadership.a_first_follower": "an other value", + "my_leadership_4.my_leadership.a_second_follower": "again an other value" } ] } \ No newline at end of file diff --git a/tests/types/result/leadership/variables_rw.json b/tests/types/result/leadership/variables_rw.json index f6bf4e498..5731c61c4 100644 --- a/tests/types/result/leadership/variables_rw.json +++ b/tests/types/result/leadership/variables_rw.json @@ -1,36 +1,36 @@ { - "ns2.my_leadership_1.my_leadership.a_leader": [ + "my_leadership_1.my_leadership.a_leader": [ { - "ns2.my_leadership_1.my_leadership.a_leader": "a value", - "ns2.my_leadership_1.my_leadership.a_first_follower": "an other value", - "ns2.my_leadership_1.my_leadership.a_second_follower": "again an other value" + "my_leadership_1.my_leadership.a_leader": "a value", + "my_leadership_1.my_leadership.a_first_follower": "an other value", + "my_leadership_1.my_leadership.a_second_follower": "again an other value" } ], - "ns2.my_leadership_2.my_leadership.a_leader": [ + "my_leadership_2.my_leadership.a_leader": [ { - "ns2.my_leadership_2.my_leadership.a_leader": "a value", - "ns2.my_leadership_2.my_leadership.a_first_follower": "a modified value", - "ns2.my_leadership_2.my_leadership.a_second_follower": "again an other value" + "my_leadership_2.my_leadership.a_leader": "a value", + "my_leadership_2.my_leadership.a_first_follower": "a modified value", + "my_leadership_2.my_leadership.a_second_follower": "again an other value" } ], - "ns2.my_leadership_3.my_leadership.a_leader": [ + "my_leadership_3.my_leadership.a_leader": [ { - "ns2.my_leadership_3.my_leadership.a_leader": "a value", - "ns2.my_leadership_3.my_leadership.a_first_follower": "an other value", - "ns2.my_leadership_3.my_leadership.a_second_follower": "again an other value", - "ns2.my_leadership_3.my_leadership.a_new_follower": "a value" + "my_leadership_3.my_leadership.a_leader": "a value", + "my_leadership_3.my_leadership.a_first_follower": "an other value", + "my_leadership_3.my_leadership.a_second_follower": "again an other value", + "my_leadership_3.my_leadership.a_new_follower": "a value" } ], - "ns2.my_leadership_4.my_leadership.a_leader": [ + "my_leadership_4.my_leadership.a_leader": [ { - "ns2.my_leadership_4.my_leadership.a_leader": "a value leader", - "ns2.my_leadership_4.my_leadership.a_first_follower": "an other value", - "ns2.my_leadership_4.my_leadership.a_second_follower": "again an other value" + "my_leadership_4.my_leadership.a_leader": "a value leader", + "my_leadership_4.my_leadership.a_first_follower": "an other value", + "my_leadership_4.my_leadership.a_second_follower": "again an other value" }, { - "ns2.my_leadership_4.my_leadership.a_leader": "a second leader", - "ns2.my_leadership_4.my_leadership.a_first_follower": "an other value", - "ns2.my_leadership_4.my_leadership.a_second_follower": "again an other value" + "my_leadership_4.my_leadership.a_leader": "a second leader", + "my_leadership_4.my_leadership.a_first_follower": "an other value", + "my_leadership_4.my_leadership.a_second_follower": "again an other value" } ] } \ No newline at end of file diff --git a/tests/types/result/secret_manager/namespace_tiramisu.py b/tests/types/result/secret_manager/namespace_tiramisu.py index 6353ae1ee..ec60e1a0a 100644 --- a/tests/types/result/secret_manager/namespace_tiramisu.py +++ b/tests/types/result/secret_manager/namespace_tiramisu.py @@ -9,6 +9,7 @@ except: ALLOWED_LEADER_PROPERTIES.add("basic") ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") -option_1 = PasswordOption(name="secret1", doc="the secret", properties=frozenset({"basic", "mandatory", "novalidator"}), informations={'secret_manager': True, 'ymlfiles': ['tests/types/types/secret_manager/00-base.yml', 'tests/types/structures/secret_manager/00-base.yml'], 'type': 'secret'}) -option_2 = PasswordOption(name="secret2", doc="the secret", properties=frozenset({"basic", "mandatory", "novalidator"}), informations={'secret_manager': True, 'ymlfiles': ['tests/types/types/secret_manager/00-base.yml', 'tests/types/structures/secret_manager/00-base.yml'], 'type': 'secret'}) -option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, option_2]) +option_3 = PasswordOption(name="secret1", doc="the secret", properties=frozenset({"basic", "mandatory", "novalidator"}), informations={'secret_manager': True, 'ymlfiles': ['tests/types/types/secret_manager/00-base.yml', 'tests/types/structures/secret_manager/00-base.yml'], 'type': 'secret'}) +option_4 = PasswordOption(name="secret2", doc="the secret", properties=frozenset({"basic", "mandatory", "novalidator"}), informations={'secret_manager': True, 'ymlfiles': ['tests/types/types/secret_manager/00-base.yml', 'tests/types/structures/secret_manager/00-base.yml'], 'type': 'secret'}) +optiondescription_2 = OptionDescription(name="ns2", doc="NS2", group_type=groups.namespace, children=[option_3, option_4], properties=frozenset({"basic"})) +option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_2]) diff --git a/tests/types/result/secret_manager/namespace_variables.json b/tests/types/result/secret_manager/namespace_variables.json index dc44d59c1..e9ed53524 100644 --- a/tests/types/result/secret_manager/namespace_variables.json +++ b/tests/types/result/secret_manager/namespace_variables.json @@ -1,4 +1,4 @@ { - "secret1": null, - "secret2": null + "ns2.secret1": null, + "ns2.secret2": null } \ No newline at end of file diff --git a/tests/types/result/secret_manager/namespace_variables_rw.json b/tests/types/result/secret_manager/namespace_variables_rw.json index dc44d59c1..e9ed53524 100644 --- a/tests/types/result/secret_manager/namespace_variables_rw.json +++ b/tests/types/result/secret_manager/namespace_variables_rw.json @@ -1,4 +1,4 @@ { - "secret1": null, - "secret2": null + "ns2.secret1": null, + "ns2.secret2": null } \ No newline at end of file diff --git a/tests/types/result/secret_manager/tiramisu.py b/tests/types/result/secret_manager/tiramisu.py index ec60e1a0a..6353ae1ee 100644 --- a/tests/types/result/secret_manager/tiramisu.py +++ b/tests/types/result/secret_manager/tiramisu.py @@ -9,7 +9,6 @@ except: ALLOWED_LEADER_PROPERTIES.add("basic") ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") -option_3 = PasswordOption(name="secret1", doc="the secret", properties=frozenset({"basic", "mandatory", "novalidator"}), informations={'secret_manager': True, 'ymlfiles': ['tests/types/types/secret_manager/00-base.yml', 'tests/types/structures/secret_manager/00-base.yml'], 'type': 'secret'}) -option_4 = PasswordOption(name="secret2", doc="the secret", properties=frozenset({"basic", "mandatory", "novalidator"}), informations={'secret_manager': True, 'ymlfiles': ['tests/types/types/secret_manager/00-base.yml', 'tests/types/structures/secret_manager/00-base.yml'], 'type': 'secret'}) -optiondescription_2 = OptionDescription(name="ns2", doc="NS2", group_type=groups.namespace, children=[option_3, option_4], properties=frozenset({"basic"})) -option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_2]) +option_1 = PasswordOption(name="secret1", doc="the secret", properties=frozenset({"basic", "mandatory", "novalidator"}), informations={'secret_manager': True, 'ymlfiles': ['tests/types/types/secret_manager/00-base.yml', 'tests/types/structures/secret_manager/00-base.yml'], 'type': 'secret'}) +option_2 = PasswordOption(name="secret2", doc="the secret", properties=frozenset({"basic", "mandatory", "novalidator"}), informations={'secret_manager': True, 'ymlfiles': ['tests/types/types/secret_manager/00-base.yml', 'tests/types/structures/secret_manager/00-base.yml'], 'type': 'secret'}) +option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, option_2]) diff --git a/tests/types/result/secret_manager/variables.json b/tests/types/result/secret_manager/variables.json index e9ed53524..dc44d59c1 100644 --- a/tests/types/result/secret_manager/variables.json +++ b/tests/types/result/secret_manager/variables.json @@ -1,4 +1,4 @@ { - "ns2.secret1": null, - "ns2.secret2": null + "secret1": null, + "secret2": null } \ No newline at end of file diff --git a/tests/types/result/secret_manager/variables_rw.json b/tests/types/result/secret_manager/variables_rw.json index e9ed53524..dc44d59c1 100644 --- a/tests/types/result/secret_manager/variables_rw.json +++ b/tests/types/result/secret_manager/variables_rw.json @@ -1,4 +1,4 @@ { - "ns2.secret1": null, - "ns2.secret2": null + "secret1": null, + "secret2": null } \ No newline at end of file diff --git a/tests/types/result/variable/namespace_tiramisu.py b/tests/types/result/variable/namespace_tiramisu.py index 8f42f30df..abea33aa6 100644 --- a/tests/types/result/variable/namespace_tiramisu.py +++ b/tests/types/result/variable/namespace_tiramisu.py @@ -9,5 +9,6 @@ except: ALLOWED_LEADER_PROPERTIES.add("basic") ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") -option_1 = StrOption(name="my_var", doc="My type", default="a value", properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['tests/types/types/variable/00_type.yml', 'tests/types/structures/variable/00_structure.yml'], 'type': 'string'}) -option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1]) +option_3 = StrOption(name="my_var", doc="My type", default="a value", properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['tests/types/types/variable/00_type.yml', 'tests/types/structures/variable/00_structure.yml'], 'type': 'string'}) +optiondescription_2 = OptionDescription(name="ns2", doc="NS2", group_type=groups.namespace, children=[option_3], properties=frozenset({"standard"})) +option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_2]) diff --git a/tests/types/result/variable/namespace_variables.json b/tests/types/result/variable/namespace_variables.json index 9a5fd9c00..4e7d32888 100644 --- a/tests/types/result/variable/namespace_variables.json +++ b/tests/types/result/variable/namespace_variables.json @@ -1,3 +1,3 @@ { - "my_var": "a value" + "ns2.my_var": "a value" } \ No newline at end of file diff --git a/tests/types/result/variable/namespace_variables_rw.json b/tests/types/result/variable/namespace_variables_rw.json index 9a5fd9c00..4e7d32888 100644 --- a/tests/types/result/variable/namespace_variables_rw.json +++ b/tests/types/result/variable/namespace_variables_rw.json @@ -1,3 +1,3 @@ { - "my_var": "a value" + "ns2.my_var": "a value" } \ No newline at end of file diff --git a/tests/types/result/variable/tiramisu.py b/tests/types/result/variable/tiramisu.py index abea33aa6..8f42f30df 100644 --- a/tests/types/result/variable/tiramisu.py +++ b/tests/types/result/variable/tiramisu.py @@ -9,6 +9,5 @@ except: ALLOWED_LEADER_PROPERTIES.add("basic") ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") -option_3 = StrOption(name="my_var", doc="My type", default="a value", properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['tests/types/types/variable/00_type.yml', 'tests/types/structures/variable/00_structure.yml'], 'type': 'string'}) -optiondescription_2 = OptionDescription(name="ns2", doc="NS2", group_type=groups.namespace, children=[option_3], properties=frozenset({"standard"})) -option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_2]) +option_1 = StrOption(name="my_var", doc="My type", default="a value", properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['tests/types/types/variable/00_type.yml', 'tests/types/structures/variable/00_structure.yml'], 'type': 'string'}) +option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1]) diff --git a/tests/types/result/variable/variables.json b/tests/types/result/variable/variables.json index 4e7d32888..9a5fd9c00 100644 --- a/tests/types/result/variable/variables.json +++ b/tests/types/result/variable/variables.json @@ -1,3 +1,3 @@ { - "ns2.my_var": "a value" + "my_var": "a value" } \ No newline at end of file diff --git a/tests/types/result/variable/variables_rw.json b/tests/types/result/variable/variables_rw.json index 4e7d32888..9a5fd9c00 100644 --- a/tests/types/result/variable/variables_rw.json +++ b/tests/types/result/variable/variables_rw.json @@ -1,3 +1,3 @@ { - "ns2.my_var": "a value" + "my_var": "a value" } \ No newline at end of file diff --git a/tests/types/result/variable_hidden/namespace_tiramisu.py b/tests/types/result/variable_hidden/namespace_tiramisu.py index b10f63d02..935764555 100644 --- a/tests/types/result/variable_hidden/namespace_tiramisu.py +++ b/tests/types/result/variable_hidden/namespace_tiramisu.py @@ -9,13 +9,14 @@ except: ALLOWED_LEADER_PROPERTIES.add("basic") ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") -option_2 = StrOption(name="a_first_variable", doc="a first variable", default="a modified value", properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['tests/types/types/variable_hidden/00_structure.yml', 'tests/types/structures/variable_hidden/00_structure.yml'], 'type': 'string'}) -option_3 = StrOption(name="a_second_variable", doc="a second variable", default="a modified value", properties=frozenset({"force_default_on_freeze", "mandatory", "standard", Calculation(func['variable_to_property'], Params((), kwargs={'value': ParamOption(option_2), 'prop': ParamValue("hidden"), 'when': ParamValue("a value"), 'inverse': ParamValue(True)}), help_function=func['variable_to_property']), Calculation(func['variable_to_property'], Params((), kwargs={'value': ParamOption(option_2), 'prop': ParamValue("frozen"), 'when': ParamValue("a value"), 'inverse': ParamValue(True)}), help_function=func['variable_to_property'])}), informations={'ymlfiles': ['tests/types/types/variable_hidden/00_structure.yml', 'tests/types/structures/variable_hidden/00_structure.yml'], 'type': 'string'}) -optiondescription_1 = OptionDescription(name="my_family_1", doc="My family type", children=[option_2, option_3], properties=frozenset({"standard"}), informations={'ymlfiles': ['tests/types/types/variable_hidden/00_structure.yml', 'tests/types/structures/variable_hidden/00_structure.yml']}) -option_5 = StrOption(name="a_first_variable", doc="a first variable", default="a value", properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['tests/types/types/variable_hidden/00_structure.yml', 'tests/types/structures/variable_hidden/00_structure.yml'], 'type': 'string'}) -option_6 = StrOption(name="a_second_variable", doc="a second variable", properties=frozenset({"basic", "force_default_on_freeze", "mandatory", Calculation(func['variable_to_property'], Params((), kwargs={'value': ParamOption(option_5), 'prop': ParamValue("hidden"), 'when': ParamValue("a value"), 'inverse': ParamValue(True)}), help_function=func['variable_to_property']), Calculation(func['variable_to_property'], Params((), kwargs={'value': ParamOption(option_5), 'prop': ParamValue("frozen"), 'when': ParamValue("a value"), 'inverse': ParamValue(True)}), help_function=func['variable_to_property'])}), informations={'ymlfiles': ['tests/types/types/variable_hidden/00_structure.yml', 'tests/types/structures/variable_hidden/00_structure.yml'], 'type': 'string'}) -optiondescription_4 = OptionDescription(name="my_family_2", doc="My family type", children=[option_5, option_6], properties=frozenset({"basic"}), informations={'ymlfiles': ['tests/types/types/variable_hidden/00_structure.yml', 'tests/types/structures/variable_hidden/00_structure.yml']}) -option_8 = StrOption(name="a_first_variable", doc="a first variable", default="a value", properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['tests/types/types/variable_hidden/00_structure.yml', 'tests/types/structures/variable_hidden/00_structure.yml'], 'type': 'string'}) -option_9 = StrOption(name="a_second_variable", doc="a second variable", default="a modified value 2", properties=frozenset({"force_default_on_freeze", "mandatory", "standard", Calculation(func['variable_to_property'], Params((), kwargs={'value': ParamOption(option_8), 'prop': ParamValue("hidden"), 'when': ParamValue("a value"), 'inverse': ParamValue(True)}), help_function=func['variable_to_property']), Calculation(func['variable_to_property'], Params((), kwargs={'value': ParamOption(option_8), 'prop': ParamValue("frozen"), 'when': ParamValue("a value"), 'inverse': ParamValue(True)}), help_function=func['variable_to_property'])}), informations={'ymlfiles': ['tests/types/types/variable_hidden/00_structure.yml', 'tests/types/structures/variable_hidden/00_structure.yml'], 'type': 'string'}) -optiondescription_7 = OptionDescription(name="my_family_3", doc="My family type", children=[option_8, option_9], properties=frozenset({"standard"}), informations={'ymlfiles': ['tests/types/types/variable_hidden/00_structure.yml', 'tests/types/structures/variable_hidden/00_structure.yml']}) -option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1, optiondescription_4, optiondescription_7]) +option_4 = StrOption(name="a_first_variable", doc="a first variable", default="a modified value", properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['tests/types/types/variable_hidden/00_structure.yml', 'tests/types/structures/variable_hidden/00_structure.yml'], 'type': 'string'}) +option_5 = StrOption(name="a_second_variable", doc="a second variable", default="a modified value", properties=frozenset({"force_default_on_freeze", "mandatory", "standard", Calculation(func['variable_to_property'], Params((), kwargs={'value': ParamOption(option_4), 'prop': ParamValue("hidden"), 'when': ParamValue("a value"), 'inverse': ParamValue(True)}), help_function=func['variable_to_property']), Calculation(func['variable_to_property'], Params((), kwargs={'value': ParamOption(option_4), 'prop': ParamValue("frozen"), 'when': ParamValue("a value"), 'inverse': ParamValue(True)}), help_function=func['variable_to_property'])}), informations={'ymlfiles': ['tests/types/types/variable_hidden/00_structure.yml', 'tests/types/structures/variable_hidden/00_structure.yml'], 'type': 'string'}) +optiondescription_3 = OptionDescription(name="my_family_1", doc="My family type", children=[option_4, option_5], properties=frozenset({"standard"}), informations={'ymlfiles': ['tests/types/types/variable_hidden/00_structure.yml', 'tests/types/structures/variable_hidden/00_structure.yml']}) +option_7 = StrOption(name="a_first_variable", doc="a first variable", default="a value", properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['tests/types/types/variable_hidden/00_structure.yml', 'tests/types/structures/variable_hidden/00_structure.yml'], 'type': 'string'}) +option_8 = StrOption(name="a_second_variable", doc="a second variable", properties=frozenset({"basic", "force_default_on_freeze", "mandatory", Calculation(func['variable_to_property'], Params((), kwargs={'value': ParamOption(option_7), 'prop': ParamValue("hidden"), 'when': ParamValue("a value"), 'inverse': ParamValue(True)}), help_function=func['variable_to_property']), Calculation(func['variable_to_property'], Params((), kwargs={'value': ParamOption(option_7), 'prop': ParamValue("frozen"), 'when': ParamValue("a value"), 'inverse': ParamValue(True)}), help_function=func['variable_to_property'])}), informations={'ymlfiles': ['tests/types/types/variable_hidden/00_structure.yml', 'tests/types/structures/variable_hidden/00_structure.yml'], 'type': 'string'}) +optiondescription_6 = OptionDescription(name="my_family_2", doc="My family type", children=[option_7, option_8], properties=frozenset({"basic"}), informations={'ymlfiles': ['tests/types/types/variable_hidden/00_structure.yml', 'tests/types/structures/variable_hidden/00_structure.yml']}) +option_10 = StrOption(name="a_first_variable", doc="a first variable", default="a value", properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['tests/types/types/variable_hidden/00_structure.yml', 'tests/types/structures/variable_hidden/00_structure.yml'], 'type': 'string'}) +option_11 = StrOption(name="a_second_variable", doc="a second variable", default="a modified value 2", properties=frozenset({"force_default_on_freeze", "mandatory", "standard", Calculation(func['variable_to_property'], Params((), kwargs={'value': ParamOption(option_10), 'prop': ParamValue("hidden"), 'when': ParamValue("a value"), 'inverse': ParamValue(True)}), help_function=func['variable_to_property']), Calculation(func['variable_to_property'], Params((), kwargs={'value': ParamOption(option_10), 'prop': ParamValue("frozen"), 'when': ParamValue("a value"), 'inverse': ParamValue(True)}), help_function=func['variable_to_property'])}), informations={'ymlfiles': ['tests/types/types/variable_hidden/00_structure.yml', 'tests/types/structures/variable_hidden/00_structure.yml'], 'type': 'string'}) +optiondescription_9 = OptionDescription(name="my_family_3", doc="My family type", children=[option_10, option_11], properties=frozenset({"standard"}), informations={'ymlfiles': ['tests/types/types/variable_hidden/00_structure.yml', 'tests/types/structures/variable_hidden/00_structure.yml']}) +optiondescription_2 = OptionDescription(name="ns2", doc="NS2", group_type=groups.namespace, children=[optiondescription_3, optiondescription_6, optiondescription_9], properties=frozenset({"basic"})) +option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_2]) diff --git a/tests/types/result/variable_hidden/namespace_variables.json b/tests/types/result/variable_hidden/namespace_variables.json index b31e2eb1a..9d4a25d49 100644 --- a/tests/types/result/variable_hidden/namespace_variables.json +++ b/tests/types/result/variable_hidden/namespace_variables.json @@ -1,7 +1,7 @@ { - "my_family_1.a_first_variable": "a modified value", - "my_family_2.a_first_variable": "a value", - "my_family_2.a_second_variable": null, - "my_family_3.a_first_variable": "a value", - "my_family_3.a_second_variable": "a modified value 2" + "ns2.my_family_1.a_first_variable": "a modified value", + "ns2.my_family_2.a_first_variable": "a value", + "ns2.my_family_2.a_second_variable": null, + "ns2.my_family_3.a_first_variable": "a value", + "ns2.my_family_3.a_second_variable": "a modified value 2" } \ No newline at end of file diff --git a/tests/types/result/variable_hidden/namespace_variables_rw.json b/tests/types/result/variable_hidden/namespace_variables_rw.json index b31e2eb1a..9d4a25d49 100644 --- a/tests/types/result/variable_hidden/namespace_variables_rw.json +++ b/tests/types/result/variable_hidden/namespace_variables_rw.json @@ -1,7 +1,7 @@ { - "my_family_1.a_first_variable": "a modified value", - "my_family_2.a_first_variable": "a value", - "my_family_2.a_second_variable": null, - "my_family_3.a_first_variable": "a value", - "my_family_3.a_second_variable": "a modified value 2" + "ns2.my_family_1.a_first_variable": "a modified value", + "ns2.my_family_2.a_first_variable": "a value", + "ns2.my_family_2.a_second_variable": null, + "ns2.my_family_3.a_first_variable": "a value", + "ns2.my_family_3.a_second_variable": "a modified value 2" } \ No newline at end of file diff --git a/tests/types/result/variable_hidden/tiramisu.py b/tests/types/result/variable_hidden/tiramisu.py index 935764555..b10f63d02 100644 --- a/tests/types/result/variable_hidden/tiramisu.py +++ b/tests/types/result/variable_hidden/tiramisu.py @@ -9,14 +9,13 @@ except: ALLOWED_LEADER_PROPERTIES.add("basic") ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") -option_4 = StrOption(name="a_first_variable", doc="a first variable", default="a modified value", properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['tests/types/types/variable_hidden/00_structure.yml', 'tests/types/structures/variable_hidden/00_structure.yml'], 'type': 'string'}) -option_5 = StrOption(name="a_second_variable", doc="a second variable", default="a modified value", properties=frozenset({"force_default_on_freeze", "mandatory", "standard", Calculation(func['variable_to_property'], Params((), kwargs={'value': ParamOption(option_4), 'prop': ParamValue("hidden"), 'when': ParamValue("a value"), 'inverse': ParamValue(True)}), help_function=func['variable_to_property']), Calculation(func['variable_to_property'], Params((), kwargs={'value': ParamOption(option_4), 'prop': ParamValue("frozen"), 'when': ParamValue("a value"), 'inverse': ParamValue(True)}), help_function=func['variable_to_property'])}), informations={'ymlfiles': ['tests/types/types/variable_hidden/00_structure.yml', 'tests/types/structures/variable_hidden/00_structure.yml'], 'type': 'string'}) -optiondescription_3 = OptionDescription(name="my_family_1", doc="My family type", children=[option_4, option_5], properties=frozenset({"standard"}), informations={'ymlfiles': ['tests/types/types/variable_hidden/00_structure.yml', 'tests/types/structures/variable_hidden/00_structure.yml']}) -option_7 = StrOption(name="a_first_variable", doc="a first variable", default="a value", properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['tests/types/types/variable_hidden/00_structure.yml', 'tests/types/structures/variable_hidden/00_structure.yml'], 'type': 'string'}) -option_8 = StrOption(name="a_second_variable", doc="a second variable", properties=frozenset({"basic", "force_default_on_freeze", "mandatory", Calculation(func['variable_to_property'], Params((), kwargs={'value': ParamOption(option_7), 'prop': ParamValue("hidden"), 'when': ParamValue("a value"), 'inverse': ParamValue(True)}), help_function=func['variable_to_property']), Calculation(func['variable_to_property'], Params((), kwargs={'value': ParamOption(option_7), 'prop': ParamValue("frozen"), 'when': ParamValue("a value"), 'inverse': ParamValue(True)}), help_function=func['variable_to_property'])}), informations={'ymlfiles': ['tests/types/types/variable_hidden/00_structure.yml', 'tests/types/structures/variable_hidden/00_structure.yml'], 'type': 'string'}) -optiondescription_6 = OptionDescription(name="my_family_2", doc="My family type", children=[option_7, option_8], properties=frozenset({"basic"}), informations={'ymlfiles': ['tests/types/types/variable_hidden/00_structure.yml', 'tests/types/structures/variable_hidden/00_structure.yml']}) -option_10 = StrOption(name="a_first_variable", doc="a first variable", default="a value", properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['tests/types/types/variable_hidden/00_structure.yml', 'tests/types/structures/variable_hidden/00_structure.yml'], 'type': 'string'}) -option_11 = StrOption(name="a_second_variable", doc="a second variable", default="a modified value 2", properties=frozenset({"force_default_on_freeze", "mandatory", "standard", Calculation(func['variable_to_property'], Params((), kwargs={'value': ParamOption(option_10), 'prop': ParamValue("hidden"), 'when': ParamValue("a value"), 'inverse': ParamValue(True)}), help_function=func['variable_to_property']), Calculation(func['variable_to_property'], Params((), kwargs={'value': ParamOption(option_10), 'prop': ParamValue("frozen"), 'when': ParamValue("a value"), 'inverse': ParamValue(True)}), help_function=func['variable_to_property'])}), informations={'ymlfiles': ['tests/types/types/variable_hidden/00_structure.yml', 'tests/types/structures/variable_hidden/00_structure.yml'], 'type': 'string'}) -optiondescription_9 = OptionDescription(name="my_family_3", doc="My family type", children=[option_10, option_11], properties=frozenset({"standard"}), informations={'ymlfiles': ['tests/types/types/variable_hidden/00_structure.yml', 'tests/types/structures/variable_hidden/00_structure.yml']}) -optiondescription_2 = OptionDescription(name="ns2", doc="NS2", group_type=groups.namespace, children=[optiondescription_3, optiondescription_6, optiondescription_9], properties=frozenset({"basic"})) -option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_2]) +option_2 = StrOption(name="a_first_variable", doc="a first variable", default="a modified value", properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['tests/types/types/variable_hidden/00_structure.yml', 'tests/types/structures/variable_hidden/00_structure.yml'], 'type': 'string'}) +option_3 = StrOption(name="a_second_variable", doc="a second variable", default="a modified value", properties=frozenset({"force_default_on_freeze", "mandatory", "standard", Calculation(func['variable_to_property'], Params((), kwargs={'value': ParamOption(option_2), 'prop': ParamValue("hidden"), 'when': ParamValue("a value"), 'inverse': ParamValue(True)}), help_function=func['variable_to_property']), Calculation(func['variable_to_property'], Params((), kwargs={'value': ParamOption(option_2), 'prop': ParamValue("frozen"), 'when': ParamValue("a value"), 'inverse': ParamValue(True)}), help_function=func['variable_to_property'])}), informations={'ymlfiles': ['tests/types/types/variable_hidden/00_structure.yml', 'tests/types/structures/variable_hidden/00_structure.yml'], 'type': 'string'}) +optiondescription_1 = OptionDescription(name="my_family_1", doc="My family type", children=[option_2, option_3], properties=frozenset({"standard"}), informations={'ymlfiles': ['tests/types/types/variable_hidden/00_structure.yml', 'tests/types/structures/variable_hidden/00_structure.yml']}) +option_5 = StrOption(name="a_first_variable", doc="a first variable", default="a value", properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['tests/types/types/variable_hidden/00_structure.yml', 'tests/types/structures/variable_hidden/00_structure.yml'], 'type': 'string'}) +option_6 = StrOption(name="a_second_variable", doc="a second variable", properties=frozenset({"basic", "force_default_on_freeze", "mandatory", Calculation(func['variable_to_property'], Params((), kwargs={'value': ParamOption(option_5), 'prop': ParamValue("hidden"), 'when': ParamValue("a value"), 'inverse': ParamValue(True)}), help_function=func['variable_to_property']), Calculation(func['variable_to_property'], Params((), kwargs={'value': ParamOption(option_5), 'prop': ParamValue("frozen"), 'when': ParamValue("a value"), 'inverse': ParamValue(True)}), help_function=func['variable_to_property'])}), informations={'ymlfiles': ['tests/types/types/variable_hidden/00_structure.yml', 'tests/types/structures/variable_hidden/00_structure.yml'], 'type': 'string'}) +optiondescription_4 = OptionDescription(name="my_family_2", doc="My family type", children=[option_5, option_6], properties=frozenset({"basic"}), informations={'ymlfiles': ['tests/types/types/variable_hidden/00_structure.yml', 'tests/types/structures/variable_hidden/00_structure.yml']}) +option_8 = StrOption(name="a_first_variable", doc="a first variable", default="a value", properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['tests/types/types/variable_hidden/00_structure.yml', 'tests/types/structures/variable_hidden/00_structure.yml'], 'type': 'string'}) +option_9 = StrOption(name="a_second_variable", doc="a second variable", default="a modified value 2", properties=frozenset({"force_default_on_freeze", "mandatory", "standard", Calculation(func['variable_to_property'], Params((), kwargs={'value': ParamOption(option_8), 'prop': ParamValue("hidden"), 'when': ParamValue("a value"), 'inverse': ParamValue(True)}), help_function=func['variable_to_property']), Calculation(func['variable_to_property'], Params((), kwargs={'value': ParamOption(option_8), 'prop': ParamValue("frozen"), 'when': ParamValue("a value"), 'inverse': ParamValue(True)}), help_function=func['variable_to_property'])}), informations={'ymlfiles': ['tests/types/types/variable_hidden/00_structure.yml', 'tests/types/structures/variable_hidden/00_structure.yml'], 'type': 'string'}) +optiondescription_7 = OptionDescription(name="my_family_3", doc="My family type", children=[option_8, option_9], properties=frozenset({"standard"}), informations={'ymlfiles': ['tests/types/types/variable_hidden/00_structure.yml', 'tests/types/structures/variable_hidden/00_structure.yml']}) +option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1, optiondescription_4, optiondescription_7]) diff --git a/tests/types/result/variable_hidden/variables.json b/tests/types/result/variable_hidden/variables.json index 9d4a25d49..b31e2eb1a 100644 --- a/tests/types/result/variable_hidden/variables.json +++ b/tests/types/result/variable_hidden/variables.json @@ -1,7 +1,7 @@ { - "ns2.my_family_1.a_first_variable": "a modified value", - "ns2.my_family_2.a_first_variable": "a value", - "ns2.my_family_2.a_second_variable": null, - "ns2.my_family_3.a_first_variable": "a value", - "ns2.my_family_3.a_second_variable": "a modified value 2" + "my_family_1.a_first_variable": "a modified value", + "my_family_2.a_first_variable": "a value", + "my_family_2.a_second_variable": null, + "my_family_3.a_first_variable": "a value", + "my_family_3.a_second_variable": "a modified value 2" } \ No newline at end of file diff --git a/tests/types/result/variable_hidden/variables_rw.json b/tests/types/result/variable_hidden/variables_rw.json index 9d4a25d49..b31e2eb1a 100644 --- a/tests/types/result/variable_hidden/variables_rw.json +++ b/tests/types/result/variable_hidden/variables_rw.json @@ -1,7 +1,7 @@ { - "ns2.my_family_1.a_first_variable": "a modified value", - "ns2.my_family_2.a_first_variable": "a value", - "ns2.my_family_2.a_second_variable": null, - "ns2.my_family_3.a_first_variable": "a value", - "ns2.my_family_3.a_second_variable": "a modified value 2" + "my_family_1.a_first_variable": "a modified value", + "my_family_2.a_first_variable": "a value", + "my_family_2.a_second_variable": null, + "my_family_3.a_first_variable": "a value", + "my_family_3.a_second_variable": "a modified value 2" } \ No newline at end of file diff --git a/tests/types/result/variables/namespace_tiramisu.py b/tests/types/result/variables/namespace_tiramisu.py index 19405ffa7..aaf83b967 100644 --- a/tests/types/result/variables/namespace_tiramisu.py +++ b/tests/types/result/variables/namespace_tiramisu.py @@ -9,7 +9,8 @@ except: ALLOWED_LEADER_PROPERTIES.add("basic") ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") -option_1 = StrOption(name="my_var1", doc="My type", default="a value", properties=frozenset({"an_other_tag", "mandatory", "standard"}), informations={'ymlfiles': ['tests/types/types/variables/00_type.yml', 'tests/types/structures/variables/00_structure.yml'], 'type': 'string', 'tags': ('an_other_tag',)}) -option_2 = StrOption(name="my_var2", doc="My type", default="a value", properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['tests/types/types/variables/00_type.yml', 'tests/types/structures/variables/00_structure.yml'], 'type': 'string'}) -option_3 = StrOption(name="my_var3", doc="my_var3", properties=frozenset({"basic", "mandatory"}), informations={'ymlfiles': ['tests/types/structures/variables/00_structure.yml'], 'type': 'string'}) -option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, option_2, option_3]) +option_3 = StrOption(name="my_var1", doc="My type", default="a value", properties=frozenset({"an_other_tag", "mandatory", "standard"}), informations={'ymlfiles': ['tests/types/types/variables/00_type.yml', 'tests/types/structures/variables/00_structure.yml'], 'type': 'string', 'tags': ('an_other_tag',)}) +option_4 = StrOption(name="my_var2", doc="My type", default="a value", properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['tests/types/types/variables/00_type.yml', 'tests/types/structures/variables/00_structure.yml'], 'type': 'string'}) +option_5 = StrOption(name="my_var3", doc="my_var3", properties=frozenset({"basic", "mandatory"}), informations={'ymlfiles': ['tests/types/structures/variables/00_structure.yml'], 'type': 'string'}) +optiondescription_2 = OptionDescription(name="ns2", doc="NS2", group_type=groups.namespace, children=[option_3, option_4, option_5], properties=frozenset({"basic"})) +option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_2]) diff --git a/tests/types/result/variables/namespace_variables.json b/tests/types/result/variables/namespace_variables.json index 8866b0893..34792bf58 100644 --- a/tests/types/result/variables/namespace_variables.json +++ b/tests/types/result/variables/namespace_variables.json @@ -1,5 +1,5 @@ { - "my_var1": "a value", - "my_var2": "a value", - "my_var3": null + "ns2.my_var1": "a value", + "ns2.my_var2": "a value", + "ns2.my_var3": null } \ No newline at end of file diff --git a/tests/types/result/variables/namespace_variables_rw.json b/tests/types/result/variables/namespace_variables_rw.json index 8866b0893..34792bf58 100644 --- a/tests/types/result/variables/namespace_variables_rw.json +++ b/tests/types/result/variables/namespace_variables_rw.json @@ -1,5 +1,5 @@ { - "my_var1": "a value", - "my_var2": "a value", - "my_var3": null + "ns2.my_var1": "a value", + "ns2.my_var2": "a value", + "ns2.my_var3": null } \ No newline at end of file diff --git a/tests/types/result/variables/tiramisu.py b/tests/types/result/variables/tiramisu.py index aaf83b967..19405ffa7 100644 --- a/tests/types/result/variables/tiramisu.py +++ b/tests/types/result/variables/tiramisu.py @@ -9,8 +9,7 @@ except: ALLOWED_LEADER_PROPERTIES.add("basic") ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") -option_3 = StrOption(name="my_var1", doc="My type", default="a value", properties=frozenset({"an_other_tag", "mandatory", "standard"}), informations={'ymlfiles': ['tests/types/types/variables/00_type.yml', 'tests/types/structures/variables/00_structure.yml'], 'type': 'string', 'tags': ('an_other_tag',)}) -option_4 = StrOption(name="my_var2", doc="My type", default="a value", properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['tests/types/types/variables/00_type.yml', 'tests/types/structures/variables/00_structure.yml'], 'type': 'string'}) -option_5 = StrOption(name="my_var3", doc="my_var3", properties=frozenset({"basic", "mandatory"}), informations={'ymlfiles': ['tests/types/structures/variables/00_structure.yml'], 'type': 'string'}) -optiondescription_2 = OptionDescription(name="ns2", doc="NS2", group_type=groups.namespace, children=[option_3, option_4, option_5], properties=frozenset({"basic"})) -option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_2]) +option_1 = StrOption(name="my_var1", doc="My type", default="a value", properties=frozenset({"an_other_tag", "mandatory", "standard"}), informations={'ymlfiles': ['tests/types/types/variables/00_type.yml', 'tests/types/structures/variables/00_structure.yml'], 'type': 'string', 'tags': ('an_other_tag',)}) +option_2 = StrOption(name="my_var2", doc="My type", default="a value", properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['tests/types/types/variables/00_type.yml', 'tests/types/structures/variables/00_structure.yml'], 'type': 'string'}) +option_3 = StrOption(name="my_var3", doc="my_var3", properties=frozenset({"basic", "mandatory"}), informations={'ymlfiles': ['tests/types/structures/variables/00_structure.yml'], 'type': 'string'}) +option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, option_2, option_3]) diff --git a/tests/types/result/variables/variables.json b/tests/types/result/variables/variables.json index 34792bf58..8866b0893 100644 --- a/tests/types/result/variables/variables.json +++ b/tests/types/result/variables/variables.json @@ -1,5 +1,5 @@ { - "ns2.my_var1": "a value", - "ns2.my_var2": "a value", - "ns2.my_var3": null + "my_var1": "a value", + "my_var2": "a value", + "my_var3": null } \ No newline at end of file diff --git a/tests/types/result/variables/variables_rw.json b/tests/types/result/variables/variables_rw.json index 34792bf58..8866b0893 100644 --- a/tests/types/result/variables/variables_rw.json +++ b/tests/types/result/variables/variables_rw.json @@ -1,5 +1,5 @@ { - "ns2.my_var1": "a value", - "ns2.my_var2": "a value", - "ns2.my_var3": null + "my_var1": "a value", + "my_var2": "a value", + "my_var3": null } \ No newline at end of file diff --git a/tests/types/structures/family_double_redefine/00_structure.yml b/tests/types/structures/family_double_redefine/00_structure.yml new file mode 100644 index 000000000..986619f36 --- /dev/null +++ b/tests/types/structures/family_double_redefine/00_structure.yml @@ -0,0 +1,10 @@ +%YAML 1.2 +--- +version: 1.1 + +my_family_1: + type: my_family_type + +my_family_2: + type: my_family_type_ori +... diff --git a/tests/types/structures/family_root_dynfamily_error_name/00_structure.yml b/tests/types/structures/family_root_dynfamily_error_name/00_structure.yml new file mode 100644 index 000000000..c07f92b58 --- /dev/null +++ b/tests/types/structures/family_root_dynfamily_error_name/00_structure.yml @@ -0,0 +1,13 @@ +%YAML 1.2 +--- +version: 1.1 + +a_variable: # A variable + - val1 + - val2 + +my_family_without_identifier: + type: my_family_type + dynamic: + variable: _.a_variable +... diff --git a/tests/types/types/family_double_redefine/00_type.yml b/tests/types/types/family_double_redefine/00_type.yml new file mode 100644 index 000000000..4a1931b76 --- /dev/null +++ b/tests/types/types/family_double_redefine/00_type.yml @@ -0,0 +1,13 @@ +%YAML 1.2 +--- +version: 1.1 + +my_family_type_ori: + description: My family type ori + + my_type: + description: My type ori + default: a value + tags: + - one_tag +... diff --git a/tests/types/types/family_double_redefine/10_redefine.yml b/tests/types/types/family_double_redefine/10_redefine.yml new file mode 100644 index 000000000..e9725b304 --- /dev/null +++ b/tests/types/types/family_double_redefine/10_redefine.yml @@ -0,0 +1,12 @@ +%YAML 1.2 +--- +version: 1.1 + +my_family_type: + description: My family type + type: my_family_type_ori + + my_type: + redefine: true + description: My type +... diff --git a/tests/types/types/family_root_dynfamily_error_name/00_structure.yml b/tests/types/types/family_root_dynfamily_error_name/00_structure.yml new file mode 100644 index 000000000..5f1d590a6 --- /dev/null +++ b/tests/types/types/family_root_dynfamily_error_name/00_structure.yml @@ -0,0 +1,13 @@ +%YAML 1.2 +--- +version: 1.1 + +my_family_type: + description: My family type + dynamic: [] + + a_first_variable: + description: A first variable + default: + type: identifier +...