Maor Lipchuk has uploaded a new change for review. Change subject: core: Remove AutoLogin enum. ......................................................................
core: Remove AutoLogin enum. AutoLogin enum is no longer used, and should be removed. Change-Id: I7b461f9ee8a5d6be159557c4d051a69877984e92 Signed-off-by: Maor Lipchuk <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/Backend.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/VdcActionType.java 2 files changed, 17 insertions(+), 25 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/35/11935/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/Backend.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/Backend.java index 3158691..ed3bde4 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/Backend.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/Backend.java @@ -326,33 +326,27 @@ VdcActionParametersBase parameters, boolean runAsInternal, CommandContext context) { - VdcReturnValueBase returnValue = null; - switch (actionType) { - case AutoLogin: - return getErrorCommandReturnValue(VdcBllMessages.USER_NOT_AUTHORIZED_TO_PERFORM_ACTION); - default: - // Evaluate and set the correlationId on the parameters, fails on invalid correlation id - boolean hasCorrelationId = - parameters == null ? false : StringUtils.isNotEmpty(parameters.getCorrelationId()); - returnValue = ExecutionHandler.evaluateCorrelationId(parameters); - if (returnValue != null) { - log.warnFormat("CanDoAction of action {0} failed. Reasons: {1}", actionType, - StringUtils.join(returnValue.getCanDoActionMessages(), ',')); - return returnValue; - } - - CommandBase<?> command = CommandsFactory.CreateCommand(actionType, parameters); - command.setInternalExecution(runAsInternal); - command.setContext(context); - ExecutionHandler.prepareCommandForMonitoring(command, actionType, runAsInternal, hasCorrelationId); - - returnValue = command.executeAction(); - returnValue.setCorrelationId(parameters.getCorrelationId()); - returnValue.setJobId(command.getJobId()); + // Evaluate and set the correlationId on the parameters, fails on invalid correlation id + boolean hasCorrelationId = + parameters == null ? false : StringUtils.isNotEmpty(parameters.getCorrelationId()); + returnValue = ExecutionHandler.evaluateCorrelationId(parameters); + if (returnValue != null) { + log.warnFormat("CanDoAction of action {0} failed. Reasons: {1}", actionType, + StringUtils.join(returnValue.getCanDoActionMessages(), ',')); return returnValue; } + + CommandBase<?> command = CommandsFactory.CreateCommand(actionType, parameters); + command.setInternalExecution(runAsInternal); + command.setContext(context); + ExecutionHandler.prepareCommandForMonitoring(command, actionType, runAsInternal, hasCorrelationId); + + returnValue = command.executeAction(); + returnValue.setCorrelationId(parameters.getCorrelationId()); + returnValue.setJobId(command.getJobId()); + return returnValue; } @Override @@ -500,7 +494,6 @@ @Override public VdcReturnValueBase Login(LoginUserParameters parameters) { switch (parameters.getActionType()) { - case AutoLogin: case LoginUser: case LoginAdminUser: CommandBase<?> command = CommandsFactory.CreateCommand(parameters.getActionType(), parameters); 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 b830fb1..38a4c8d 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 @@ AttachUserToVmFromPoolAndRun(318, ActionGroup.VM_POOL_BASIC_OPERATIONS, QuotaDependency.NONE), // UserAndGroupsCommands LoginUser(406, ActionGroup.LOGIN, false, QuotaDependency.NONE), - AutoLogin(407, false, QuotaDependency.NONE), LogoutUser(408, false, QuotaDependency.NONE), RemoveUser(409, ActionGroup.MANIPULATE_USERS, false, QuotaDependency.NONE), RemoveAdGroup(415, ActionGroup.MANIPULATE_USERS, false, QuotaDependency.NONE), -- To view, visit http://gerrit.ovirt.org/11935 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7b461f9ee8a5d6be159557c4d051a69877984e92 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Maor Lipchuk <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
