Mike Kolesnik has uploaded a new change for review. Change subject: engine: Moved action message parameters ......................................................................
engine: Moved action message parameters Moved action message parameters to their corresponding function in the networking commands. In UpdateVmInterfaceCommand the parameters are already set so no need to set them in the middle of the 'can do action'. Change-Id: I6d06e78f279d8655c99906b4c64e68c1a5e0b947 Signed-off-by: Mike Kolesnik <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/dc/AddNetworkCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/dc/NetworkCommon.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/dc/RemoveNetworkCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/dc/UpdateNetworkCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/vm/AbstractVmInterfaceCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/vm/AddVmInterfaceCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/vm/UpdateVmInterfaceCommand.java 7 files changed, 29 insertions(+), 11 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/55/10455/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/dc/AddNetworkCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/dc/AddNetworkCommand.java index 2bb571e..cd98aeb 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/dc/AddNetworkCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/dc/AddNetworkCommand.java @@ -33,10 +33,13 @@ } @Override - protected boolean canDoAction() { + protected void setActionMessageParameters() { + super.setActionMessageParameters(); addCanDoActionMessage(VdcBllMessages.VAR__ACTION__ADD); - addCanDoActionMessage(VdcBllMessages.VAR__TYPE__NETWORK); + } + @Override + protected boolean canDoAction() { if (!validateVmNetwork()) { return false; } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/dc/NetworkCommon.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/dc/NetworkCommon.java index 4e3a0d1..3b1e6de 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/dc/NetworkCommon.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/dc/NetworkCommon.java @@ -30,6 +30,11 @@ return getParameters().getNetwork().getname(); } + @Override + protected void setActionMessageParameters() { + addCanDoActionMessage(VdcBllMessages.VAR__TYPE__NETWORK); + } + protected boolean validateVmNetwork() { boolean retVal = true; diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/dc/RemoveNetworkCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/dc/RemoveNetworkCommand.java index c04e0eb..274ea6f 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/dc/RemoveNetworkCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/dc/RemoveNetworkCommand.java @@ -21,10 +21,13 @@ } @Override - protected boolean canDoAction() { + protected void setActionMessageParameters() { + super.setActionMessageParameters(); addCanDoActionMessage(VdcBllMessages.VAR__ACTION__REMOVE); - addCanDoActionMessage(VdcBllMessages.VAR__TYPE__NETWORK); + } + @Override + protected boolean canDoAction() { return CommonNetworkValidation(getParameters().getNetwork(), getReturnValue().getCanDoActionMessages()); } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/dc/UpdateNetworkCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/dc/UpdateNetworkCommand.java index cdd631a..db149c0 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/dc/UpdateNetworkCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/dc/UpdateNetworkCommand.java @@ -34,11 +34,14 @@ } @Override + protected void setActionMessageParameters() { + super.setActionMessageParameters(); + addCanDoActionMessage(VdcBllMessages.VAR__ACTION__UPDATE); + } + + @Override protected boolean canDoAction() { List<Network> networks = DbFacade.getInstance().getNetworkDao().getAll(); - - addCanDoActionMessage(VdcBllMessages.VAR__ACTION__UPDATE); - addCanDoActionMessage(VdcBllMessages.VAR__TYPE__NETWORK); if (getStoragePool() == null) { addCanDoActionMessage(VdcBllMessages.ACTION_TYPE_FAILED_STORAGE_POOL_NOT_EXIST); diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/vm/AbstractVmInterfaceCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/vm/AbstractVmInterfaceCommand.java index 13f9fd2..c67bc8d 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/vm/AbstractVmInterfaceCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/vm/AbstractVmInterfaceCommand.java @@ -7,6 +7,7 @@ import org.ovirt.engine.core.common.action.VdcReturnValueBase; import org.ovirt.engine.core.common.action.VmOperationParameterBase; import org.ovirt.engine.core.compat.Guid; +import org.ovirt.engine.core.dal.VdcBllMessages; @SuppressWarnings("serial") public abstract class AbstractVmInterfaceCommand<T extends VmOperationParameterBase> extends VmCommand<T> { @@ -26,6 +27,11 @@ return returnValue.getSucceeded(); } + @Override + protected void setActionMessageParameters() { + addCanDoActionMessage(VdcBllMessages.VAR__TYPE__INTERFACE); + } + private ActivateDeactivateVmNicParameters createActivateDeactivateParameters(Guid nicId, PlugAction plugAction) { ActivateDeactivateVmNicParameters parameters = diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/vm/AddVmInterfaceCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/vm/AddVmInterfaceCommand.java index 1026862..bff1f7b 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/vm/AddVmInterfaceCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/vm/AddVmInterfaceCommand.java @@ -211,8 +211,8 @@ */ @Override protected void setActionMessageParameters() { + super.setActionMessageParameters(); addCanDoActionMessage(VdcBllMessages.VAR__ACTION__ADD); - addCanDoActionMessage(VdcBllMessages.VAR__TYPE__INTERFACE); } @Override diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/vm/UpdateVmInterfaceCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/vm/UpdateVmInterfaceCommand.java index 156e6d3..aaa18ae 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/vm/UpdateVmInterfaceCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/vm/UpdateVmInterfaceCommand.java @@ -195,8 +195,6 @@ allInterfaces, allDisks, getReturnValue().getCanDoActionMessages())) { - addCanDoActionMessage(VdcBllMessages.VAR__ACTION__UPDATE); - addCanDoActionMessage(VdcBllMessages.VAR__TYPE__INTERFACE); return false; } @@ -262,8 +260,8 @@ */ @Override protected void setActionMessageParameters() { + super.setActionMessageParameters(); addCanDoActionMessage(VdcBllMessages.VAR__ACTION__UPDATE); - addCanDoActionMessage(VdcBllMessages.VAR__TYPE__INTERFACE); } @Override -- To view, visit http://gerrit.ovirt.org/10455 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I6d06e78f279d8655c99906b4c64e68c1a5e0b947 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Mike Kolesnik <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
