Set optional value for attr/rel of sub-templates (#5984)

Templates which are not explicitely generated by user should honour the
optional value of each attribute and relationship to avoid issues when
instantiating objects from them.

Author: gmazoyer

backend/infrahub/core/schema/schema_branch.py

@@ -1833,12 +1833,11 @@ def add_relationships_to_template(self, node: NodeSchema) -> None:
         template_schema.relationships = [
             r for r in template_schema.relationships if r.kind == RelationshipKind.TEMPLATE
         ]
+        # Tell if the user explicitely requested this template
+        is_autogenerated_subtemplate = node.generate_template is False
 
         for relationship in node.relationships:
-            if relationship.peer in [
-                InfrahubKind.GENERICGROUP,
-                InfrahubKind.PROFILE,
-            ] or relationship.kind not in [
+            if relationship.peer in [InfrahubKind.GENERICGROUP, InfrahubKind.PROFILE] or relationship.kind not in [
                 RelationshipKind.COMPONENT,
                 RelationshipKind.PARENT,
                 RelationshipKind.ATTRIBUTE,
@@ -1856,8 +1855,9 @@ def add_relationships_to_template(self, node: NodeSchema) -> None:
                     name=relationship.name,
                     peer=rel_template_peer,
                     kind=relationship.kind,
-                    optional=relationship.kind
-                    in [RelationshipKind.COMPONENT, RelationshipKind.ATTRIBUTE, RelationshipKind.GENERIC],
+                    optional=relationship.optional
+                    if is_autogenerated_subtemplate
+                    else relationship.kind != RelationshipKind.PARENT,
                     cardinality=relationship.cardinality,
                     branch=relationship.branch,
                     identifier=self._generate_identifier_string(template_schema.kind, rel_template_peer),
@@ -1928,12 +1928,15 @@ def generate_object_template_from_node(
                 if inherited in need_template_kinds:
                     template.inherit_from.append(self._get_object_template_kind(node_kind=inherited))
 
+        # Tell if the user explicitely requested this template
+        is_autogenerated_subtemplate = node.generate_template is False
         for node_attr in node.attributes:
             if node_attr.unique:
                 continue
 
             attr = AttributeSchema(
-                optional=True, **node_attr.model_dump(exclude=["id", "unique", "optional", "read_only", "inherited"])
+                optional=node_attr.optional if is_autogenerated_subtemplate else True,
+                **node_attr.model_dump(exclude=["id", "unique", "optional", "read_only", "inherited"]),
             )
             template.attributes.append(attr)
 

backend/tests/unit/core/schema_manager/test_manager_schema.py

@@ -2955,5 +2955,13 @@ async def test_manage_object_templates_with_component_relationships():
     assert test_device.generate_template
     assert test_device.get_relationship(name="object_template").peer == test_object_template_device.kind
 
-    # Make sure interfaces relationship is converted tp interface templates
+    # Make sure interfaces relationship is converted to interface templates
     assert test_object_template_device.get_relationship("interfaces").peer == f"Template{TestKind.INTERFACE}"
+
+    # Verify attributes mapping of components
+    test_interface_template = schema_branch.get(name=f"Template{TestKind.PHYSICAL_INTERFACE}", duplicate=False)
+    test_interface = schema_branch.get(name=TestKind.PHYSICAL_INTERFACE, duplicate=False)
+    for attr in test_interface.attributes:
+        template_attr = test_interface_template.get_attribute(name=attr.name)
+        # Optional value in component template should match original's
+        assert attr.optional == template_attr.optional