Set attr source when using values from template (#5875)

Author: gmazoyer

backend/infrahub/core/node/__init__.py

@@ -308,7 +308,7 @@ async def handle_object_template(self, fields: dict, db: InfrahubDatabase, error
         for attribute_name in template._attributes:
             if attribute_name in list(fields) + [OBJECT_TEMPLATE_NAME_ATTR]:
                 continue
-            fields[attribute_name] = {"value": getattr(template, attribute_name).value}
+            fields[attribute_name] = {"value": getattr(template, attribute_name).value, "source": template.id}
 
         for relationship_name in template._relationships:
             relationship_schema = template._schema.get_relationship(name=relationship_name)

backend/infrahub/graphql/mutations/main.py

@@ -15,7 +15,7 @@
 from infrahub.core.constraint.node.runner import NodeConstraintRunner
 from infrahub.core.manager import NodeManager
 from infrahub.core.node import Node
-from infrahub.core.schema import NodeSchema, RelationshipSchema
+from infrahub.core.schema import MainSchemaTypes, NodeSchema, RelationshipSchema
 from infrahub.core.schema.generic_schema import GenericSchema
 from infrahub.core.schema.profile_schema import ProfileSchema
 from infrahub.core.schema.template_schema import TemplateSchema
@@ -232,7 +232,7 @@ async def _extract_peer_data(
         cls,
         db: InfrahubDatabase,
         template_peer: Node,
-        obj_peer_schema,
+        obj_peer_schema: MainSchemaTypes,
         parent_obj: Node,
         current_template: CoreObjectTemplate,
     ) -> Mapping[str, Any]:
@@ -241,7 +241,7 @@ async def _extract_peer_data(
         for attr in template_peer.get_schema().attribute_names:
             if attr not in obj_peer_schema.attribute_names:
                 continue
-            obj_peer_data[attr] = {"value": getattr(template_peer, attr).value}
+            obj_peer_data[attr] = {"value": getattr(template_peer, attr).value, "source": template_peer.id}
 
         for rel in template_peer.get_schema().relationship_names:
             rel_manager: RelationshipManager = getattr(template_peer, rel)

backend/tests/unit/core/test_node.py

@@ -747,18 +747,40 @@ async def test_node_create_with_object_template(
 
     assert device.id
     assert device.db_id
-    assert device.node_changelog.attributes["name"].value == "par-th2-br01"
+    assert device.name.value == device.node_changelog.attributes["name"].value == "par-th2-br01"
     assert device.node_changelog.attributes["name"].value_update_status == DiffAction.ADDED
-    assert device.node_changelog.attributes["manufacturer"].value == "Juniper"
+    assert "source" not in device.node_changelog.attributes["name"].properties
+    assert device.manufacturer.value == device.node_changelog.attributes["manufacturer"].value == "Juniper"
     assert device.node_changelog.attributes["manufacturer"].value_update_status == DiffAction.ADDED
-    assert device.node_changelog.attributes["height"].value == 1
+    assert (
+        device.manufacturer.source_id
+        == device.node_changelog.attributes["manufacturer"].properties["source"].value
+        == template.id
+    )
+    assert device.height.value == device.node_changelog.attributes["height"].value == 1
     assert device.node_changelog.attributes["height"].value_update_status == DiffAction.ADDED
-    assert device.node_changelog.attributes["weight"].value == 8
+    assert (
+        device.height.source_id == device.node_changelog.attributes["height"].properties["source"].value == template.id
+    )
+    assert device.weight.value == device.node_changelog.attributes["weight"].value == 8
     assert device.node_changelog.attributes["weight"].value_update_status == DiffAction.ADDED
-    assert device.node_changelog.attributes["airflow"].value.value == "Front to rear"
+    assert (
+        device.weight.source_id == device.node_changelog.attributes["weight"].properties["source"].value == template.id
+    )
+    assert device.airflow.value.value == device.node_changelog.attributes["airflow"].value.value == "Front to rear"
     assert device.node_changelog.attributes["airflow"].value_update_status == DiffAction.ADDED
-    assert device.node_changelog.attributes["part_number"].value == "MX204"
+    assert (
+        device.airflow.source_id
+        == device.node_changelog.attributes["airflow"].properties["source"].value
+        == template.id
+    )
+    assert device.part_number.value == device.node_changelog.attributes["part_number"].value == "MX204"
     assert device.node_changelog.attributes["part_number"].value_update_status == DiffAction.ADDED
+    assert (
+        device.part_number.source_id
+        == device.node_changelog.attributes["part_number"].properties["source"].value
+        == template.id
+    )
 
 
 # --------------------------------------------------------------------------