Skip to content
This repository has been archived by the owner on Feb 7, 2019. It is now read-only.

Fixes #3589: force LDAP objects initialisation so that their existence is checked at start-up time #19

Merged
merged 1 commit into from May 15, 2013
Merged

Fixes #3589: force LDAP objects initialisation so that their existence is checked at start-up time #19

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
11 changes: 7 additions & 4 deletions inventory-repository/src/main/scala/com/normation/inventory/ldap/core/InventoryDit.scala
View file
Open in desktop
Expand Up @@ -128,6 +128,11 @@ case class InventoryDit(val BASE_DN:DN, val SOFTWARE_BASE_DN:DN, val name:String

implicit val DIT = dit


dit.register(SOFTWARE.model)
dit.register(NODES.model)
dit.register(MACHINES.model)

object SOFTWARE extends OU("Software", SOFTWARE_BASE_DN) { software =>
object SOFT extends UUID_ENTRY[SoftwareUuid](OC_SOFTWARE, A_SOFTWARE_UUID, software.dn) {

Expand Down Expand Up @@ -171,9 +176,9 @@ case class InventoryDit(val BASE_DN:DN, val SOFTWARE_BASE_DN:DN, val name:String
mod += (A_OC,OC.objectClassNames(OC_SOLARIS_NODE).toSeq:_*)
mod
}

def dn(uuid:String) = new DN(this.rdn(uuid), servers.dn)

def idFromDN(dn:DN) : Box[NodeId] = {
if(dn.getParent == servers.dn) {
val rdn = dn.getRDN
Expand Down Expand Up @@ -269,8 +274,6 @@ class UUID_ENTRY[U <: Uuid](val entryObjectClass:String,val rdnAttributeName:Str
class OU(ouName:String,parentDn:DN)(implicit dit:AbstractDit) extends ENTRY1("ou",ouName) {
ou =>

dit.register(ou.model)

lazy val rdn : RDN = this.rdn(this.rdnValue._1)
lazy val dn = new DN(rdn, parentDn)
def model() : LDAPEntry = {
Expand Down