Fixes #23727: Group all node related access into one NodeFactRepository

Normation · Nov 22, 2023 · 1d93013 · 1d93013
1 parent 0b251ab
commit 1d93013
Show file tree

Hide file tree

Showing 128 changed files with 31,928 additions and 99,096 deletions.
diff --git a/...ry-api/src/main/scala/com/normation/inventory/services/core/FullInventoryRepository.scala b/...ry-api/src/main/scala/com/normation/inventory/services/core/FullInventoryRepository.scala
@@ -98,21 +98,9 @@ trait WriteOnlyMachineRepository[R] {
 trait MachineRepository[R] extends ReadOnlyMachineRepository with WriteOnlyMachineRepository[R]
 
 trait ReadOnlyFullInventoryRepository {
-
-  /**
-   * Retrieve a full ServerAndMachine.
-   * TODO: allows to lazy-load some heavy parts, like software, machine elements, etc.
-   */
   def get(id:          NodeId, inventoryStatus: InventoryStatus): IOResult[Option[FullInventory]]
   def get(id:          NodeId): IOResult[Option[FullInventory]]
   def getMachineId(id: NodeId, inventoryStatus: InventoryStatus): IOResult[Option[(MachineUuid, InventoryStatus)]]
-
-  def getAllInventories(inventoryStatus: InventoryStatus): IOResult[Map[NodeId, FullInventory]]
-
-  // get inventories for a set of nodes
-  def getInventories(inventoryStatus: InventoryStatus, nodeIds: Set[NodeId]): IOResult[Map[NodeId, FullInventory]]
-
-  def getAllNodeInventories(inventoryStatus: InventoryStatus): IOResult[Map[NodeId, NodeInventory]]
 }
 
 trait WriteOnlyFullInventoryRepository[R] {

diff --git a/...on/src/main/scala/com/normation/inventory/provisioning/fusion/FusionInventoryParser.scala b/...on/src/main/scala/com/normation/inventory/provisioning/fusion/FusionInventoryParser.scala
@@ -492,6 +492,8 @@ class FusionInventoryParser(
           .setTo(NodeId(policyServerId))
           .modify(_.node.main.id)
           .setTo(NodeId(uuid))
+          .modify(_.machine.id.value)
+          .setTo(IdGenerator.md5Hash(uuid))
           .modify(_.node.agents)
           .setTo(agents.map(_._1.copy(capabilities = capabilities)))
           .modify(_.node.customProperties)