Work in progress

ElaadF · Mar 18, 2020 · 1ceb1f8 · 1ceb1f8
1 parent 8d8a4e9
commit 1ceb1f8
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 1 deletion.
diff --git a/...es/rudder/rudder-core/src/main/scala/com/normation/rudder/repository/NodeRepository.scala b/...es/rudder/rudder-core/src/main/scala/com/normation/rudder/repository/NodeRepository.scala
@@ -56,6 +56,7 @@ trait WoNodeRepository {
   def updateNode(node: Node, modId: ModificationId, actor:EventActor, reason:Option[String]) : IOResult[Node]
 
   def createNode(node: Node, modId: ModificationId, actor:EventActor, reason:Option[String]) : IOResult[Node]
+  def deleteNode(node: Node, modId: ModificationId, actor:EventActor, reason:Option[String]) : IOResult[Node]
 
 
 

diff --git a/.../rudder-core/src/main/scala/com/normation/rudder/repository/ldap/LDAPNodeRepository.scala b/.../rudder-core/src/main/scala/com/normation/rudder/repository/ldap/LDAPNodeRepository.scala
@@ -54,6 +54,7 @@ import com.normation.inventory.domain.KeyStatus
 import com.normation.inventory.domain.NodeId
 import com.normation.inventory.domain.SecurityToken
 import com.normation.inventory.ldap.core.InventoryDit
+import com.normation.rudder.domain.RudderDit
 import zio._
 import zio.syntax._
 
@@ -63,6 +64,7 @@ class WoLDAPNodeRepository(
   , mapper              : LDAPEntityMapper
   , ldap                : LDAPConnectionProvider[RwLDAPConnection]
   , actionLogger        : EventLogRepository
+  , rudderDit           : RudderDit
 ) extends WoNodeRepository with NamedZioLogger {
   repo =>
 
@@ -189,8 +191,19 @@ class WoLDAPNodeRepository(
     val entry = mapper.nodeToEntry(node)
     for {
       con <- ldap
+      res <- con.save(entry).chainError(s"Error when trying to save node in promote to relay ${entry.dn}")
+      _ <- IOResult.effect(println(s"-----  ENTRY  : $entry"))
+      _ <- IOResult.effect(println(s"-----  RESULT : $res"))
+    } yield {
       node
-      res <- con.save(entry).chainError(s"Error when trying to save node '${entry.dn}")
+    }
+  }
+
+  override def deleteNode(node: Node, modId: ModificationId, actor: EventActor, reason: Option[String]): IOResult[Node] = {
+    val entry = rudderDit.NODE_CONFIGS.dn
+    for {
+      con <- ldap
+      res <- con.delete(entry).chainError(s"Error when trying to delete node '${node.id.value}")
     } yield {
       node
     }

diff --git a/webapp/sources/rudder/rudder-web/src/main/scala/bootstrap/liftweb/RudderConfig.scala b/webapp/sources/rudder/rudder-web/src/main/scala/bootstrap/liftweb/RudderConfig.scala
@@ -1532,6 +1532,7 @@ object RudderConfig extends Loggable {
     , ldapEntityMapper
     , rwLdap
     , logRepository
+    , rudderDit
   )
 
   private[this] lazy val roLdapNodeGroupRepository = new RoLDAPNodeGroupRepository(