Juan Hernandez has uploaded a new change for review. Change subject: [WIP] Add generic directory support to the AddUserCommand ......................................................................
[WIP] Add generic directory support to the AddUserCommand This change replaces the LDAP specific code of the AddUserCommand with the generic directory interfaces. Change-Id: Ie0bcf801c498a50c8d9093784284e7ab3448f772 Signed-off-by: Juan Hernandez <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddUserCommand.java 1 file changed, 9 insertions(+), 9 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/71/15771/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddUserCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddUserCommand.java index f3c18fd..37d1c81 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddUserCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddUserCommand.java @@ -3,17 +3,14 @@ import java.util.Collections; import java.util.List; -import org.ovirt.engine.core.bll.adbroker.AdActionType; -import org.ovirt.engine.core.bll.adbroker.LdapFactory; -import org.ovirt.engine.core.bll.adbroker.LdapSearchByIdParameters; import org.ovirt.engine.core.bll.directory.DirectoryManager; -import org.ovirt.engine.core.common.AuditLogType; import org.ovirt.engine.core.bll.utils.PermissionSubject; +import org.ovirt.engine.core.common.AuditLogType; import org.ovirt.engine.core.common.VdcObjectType; import org.ovirt.engine.core.common.action.AddUserParameters; -import org.ovirt.engine.core.common.businessentities.LdapGroup; import org.ovirt.engine.core.common.errors.VdcBllMessages; import org.ovirt.engine.core.common.users.Directory; +import org.ovirt.engine.core.common.users.DirectoryGroup; import org.ovirt.engine.core.common.users.DirectoryUser; import org.ovirt.engine.core.compat.Guid; @@ -53,10 +50,13 @@ addCustomValue("NewUserName", getParameters().getAdGroup().getname()); userId = getParameters().getAdGroup().getid(); domain = getParameters().getAdGroup().getdomain(); - LdapGroup adGroup = - (LdapGroup) LdapFactory.getInstance(domain).RunAdAction(AdActionType.GetAdGroupByGroupId, - new LdapSearchByIdParameters(domain, userId)).getReturnValue(); - if (adGroup == null) { + Directory directory = DirectoryManager.getInstance().getDirectory(domain); + if (directory == null) { + addCanDoActionMessage(VdcBllMessages.USER_MUST_EXIST_IN_DIRECTORY); + return false; + } + DirectoryGroup directoryGroup = directory.findGroupById(userId); + if (directoryGroup == null) { addCanDoActionMessage(VdcBllMessages.USER_MUST_EXIST_IN_DIRECTORY); return false; } -- To view, visit http://gerrit.ovirt.org/15771 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie0bcf801c498a50c8d9093784284e7ab3448f772 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Juan Hernandez <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
