Yair Zaslavsky has uploaded a new change for review. Change subject: core: Removing CreateComputerAccount command ......................................................................
core: Removing CreateComputerAccount command Change-Id: I6224722615cf61b23a35f3eda6db802e5dc1a6bd Signed-off-by: Yair Zaslavsky <[email protected]> --- D backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CreateComputerAccountCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/AdActionType.java D backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/LdapCreateComputerAccountCommand.java D backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/LdapCreateComputerAccountParameters.java D backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/CreateComputerAccountParameters.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/VdcActionType.java 6 files changed, 0 insertions(+), 206 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/91/13291/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CreateComputerAccountCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CreateComputerAccountCommand.java deleted file mode 100644 index f3b73ac..0000000 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CreateComputerAccountCommand.java +++ /dev/null @@ -1,102 +0,0 @@ -package org.ovirt.engine.core.bll; - -import java.util.Collections; -import java.util.List; - -import org.apache.commons.lang.StringUtils; -import org.ovirt.engine.core.bll.adbroker.AdActionType; -import org.ovirt.engine.core.bll.adbroker.LdapCreateComputerAccountParameters; -import org.ovirt.engine.core.bll.adbroker.LdapFactory; -import org.ovirt.engine.core.bll.adbroker.LdapIsComputerWithSameNameExistsParameters; -import org.ovirt.engine.core.bll.utils.PermissionSubject; -import org.ovirt.engine.core.common.AuditLogType; -import org.ovirt.engine.core.common.action.CreateComputerAccountParameters; -import org.ovirt.engine.core.common.businessentities.VmStatic; -import org.ovirt.engine.core.dal.VdcBllMessages; -import org.ovirt.engine.core.dal.dbbroker.DbFacade; - -// Wrong domain handling in IsComputerWithTheSameNameExists ad command -@SuppressWarnings("serial") -public class CreateComputerAccountCommand<T extends CreateComputerAccountParameters> extends CommandBase<T> { - public CreateComputerAccountCommand(T parameters) { - super(parameters); - } - - @Override - public AuditLogType getAuditLogTypeValue() { - return getSucceeded() ? AuditLogType.AD_COMPUTER_ACCOUNT_SUCCEEDED : AuditLogType.AD_COMPUTER_ACCOUNT_FAILED; - } - - private String privateComputerName; - - public String getComputerName() { - return privateComputerName; - } - - private void setComputerName(String value) { - privateComputerName = value; - } - - @Override - protected boolean canDoAction() { - boolean returnValue = true; - final VmStatic vmStatic = DbFacade.getInstance().getVmStaticDao().get(getParameters().getVmId()); - if (vmStatic != null) { - setComputerName(vmStatic.getName()); - returnValue = - ((Boolean) LdapFactory - .getInstance(getParameters().getDomain()) - .RunAdAction(AdActionType.IsComputerWithTheSameNameExists, - new LdapIsComputerWithSameNameExistsParameters(getActualDomain(), - getActualUser(), - getActualPassword(), - getComputerName())) - .getReturnValue()).booleanValue(); - if (returnValue) { - addCanDoActionMessage(VdcBllMessages.ACTION_TYPE_FAILED_NAME_ALREADY_USED); - } - } else { - addCanDoActionMessage(VdcBllMessages.ACTION_TYPE_FAILED_VM_NOT_EXIST); - - } - - addCanDoActionMessage(VdcBllMessages.VAR__ACTION__CREATE); - addCanDoActionMessage(VdcBllMessages.VAR__TYPE__COMPUTER_ACCOUNT); - return !returnValue; - } - - @Override - protected void executeCommand() { - setSucceeded(LdapFactory - .getInstance(getParameters().getDomain()) - .RunAdAction( - AdActionType.CreateComputerAccount, - new LdapCreateComputerAccountParameters(getActualDomain(), - getActualUser(), - getActualPassword(), - getParameters().getPath(), - getComputerName())) - .getSucceeded()); - } - - String getActualUser() { - return StringUtils.isEmpty(getParameters().getUserName()) ? getCurrentUser().getUserName() - : getParameters().getUserName(); - } - - String getActualPassword() { - return StringUtils.isEmpty(getParameters().getUserPassword()) ? getCurrentUser() - .getPassword() : getParameters().getUserPassword(); - } - - String getActualDomain() { - return StringUtils.isEmpty(getParameters().getDomain()) ? getCurrentUser() - .getDomainControler() : getParameters().getDomain(); - } - - @Override - public List<PermissionSubject> getPermissionCheckSubjects() { - // Not needed for admin operations. - return Collections.emptyList(); - } -} diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/AdActionType.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/AdActionType.java index ed2d5d2..0504dad 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/AdActionType.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/AdActionType.java @@ -8,7 +8,6 @@ GetAdUserByUserId, GetAdUserByUserName, GetAdUserByUserIdList, - CreateComputerAccount, ChangeUserPassword, IsComputerWithTheSameNameExists; diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/LdapCreateComputerAccountCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/LdapCreateComputerAccountCommand.java deleted file mode 100644 index 3c92e42..0000000 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/LdapCreateComputerAccountCommand.java +++ /dev/null @@ -1,23 +0,0 @@ -package org.ovirt.engine.core.bll.adbroker; - -//!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -//Unimplemented for now. We leave the code for future implementations -//!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -public class LdapCreateComputerAccountCommand extends LdapBrokerCommandBase { - - public LdapCreateComputerAccountCommand(LdapCreateComputerAccountParameters parameters) { - super(parameters); - } - - @Override - protected void executeQuery(DirectorySearcher directorySearcher) { - /* - * JTODO: // add the new computer. DirectoryEntry computers = new - * DirectoryEntry(getPath(), getLoginName(), getPassword()); - * DirectoryEntry newComputer = computers.Children.add("CN=" + - * getComputerName(), "computer"); newComputer.CommitChanges(); - * computers.close(); setReturnValue(newComputer); setSucceeded(true); - * JTODO END - */ - } -} diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/LdapCreateComputerAccountParameters.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/LdapCreateComputerAccountParameters.java deleted file mode 100644 index 093d757..0000000 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/LdapCreateComputerAccountParameters.java +++ /dev/null @@ -1,30 +0,0 @@ -package org.ovirt.engine.core.bll.adbroker; - -public class LdapCreateComputerAccountParameters extends LdapUserPasswordBaseParameters { - private String privatePath; - - public String getPath() { - return privatePath; - } - - private void setPath(String value) { - privatePath = value; - } - - private String privateComputerName; - - public String getComputerName() { - return privateComputerName; - } - - private void setComputerName(String value) { - privateComputerName = value; - } - - public LdapCreateComputerAccountParameters(String domain, String username, String password, String path, - String computerName) { - super(domain, username, password); - setPath(path); - setComputerName(computerName); - } -} diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/CreateComputerAccountParameters.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/CreateComputerAccountParameters.java deleted file mode 100644 index 4a418f4..0000000 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/CreateComputerAccountParameters.java +++ /dev/null @@ -1,49 +0,0 @@ -package org.ovirt.engine.core.common.action; - -import org.ovirt.engine.core.compat.*; - -public class CreateComputerAccountParameters extends VdcActionParametersBase implements java.io.Serializable { - - private static final long serialVersionUID = 5715983315771665602L; - - private String _path; - - private Guid _vmId = new Guid(); - - private String _userName; - - private String _userPassword; - - private String _domain; - - public CreateComputerAccountParameters(String path, Guid vmId, String userName, String userPassword, String domain) { - _path = path; - _vmId = vmId; - _userName = userName; - _userPassword = userPassword; - _domain = domain; - } - - public String getPath() { - return _path; - } - - public Guid getVmId() { - return _vmId; - } - - public String getUserName() { - return _userName; - } - - public String getUserPassword() { - return _userPassword; - } - - public String getDomain() { - return _domain; - } - - public CreateComputerAccountParameters() { - } -} diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/VdcActionType.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/VdcActionType.java index 38c7529..d9518b3 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/VdcActionType.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/VdcActionType.java @@ -127,7 +127,6 @@ RemoveUser(409, ActionGroup.MANIPULATE_USERS, false, QuotaDependency.NONE), RemoveAdGroup(415, ActionGroup.MANIPULATE_USERS, false, QuotaDependency.NONE), ChangeUserPassword(416, QuotaDependency.NONE), - CreateComputerAccount(417, QuotaDependency.NONE), LoginAdminUser(418, ActionGroup.LOGIN, false, QuotaDependency.NONE), AddUser(419, ActionGroup.MANIPULATE_USERS, false, QuotaDependency.NONE), // Tags -- To view, visit http://gerrit.ovirt.org/13291 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I6224722615cf61b23a35f3eda6db802e5dc1a6bd Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Yair Zaslavsky <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
