Moti Asayag has uploaded a new change for review.
Change subject: engine: Standardize action message parameters of cluster
......................................................................
engine: Standardize action message parameters of cluster
The action messages parameters should be added for each
cluster command invocation, notating the entity is cluster
and a varying action type.
Change-Id: I3b67dfef6dc6b2bd254631b4ecb1e62b9504c86a
Signed-off-by: Moti Asayag <masa...@redhat.com>
---
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVdsGroupCommand.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveVdsGroupCommand.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVdsGroupCommand.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsGroupCommandBase.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsGroupOperationCommandBase.java
5 files changed, 21 insertions(+), 14 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/76/36176/1
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVdsGroupCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVdsGroupCommand.java
index c6dd642..d33f936 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVdsGroupCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVdsGroupCommand.java
@@ -84,10 +84,14 @@
}
@Override
+ protected void setActionMessageParameters() {
+ super.setActionMessageParameters();
+ addCanDoActionMessage(VdcBllMessages.VAR__ACTION__CREATE);
+ }
+
+ @Override
protected boolean canDoAction() {
- boolean result = super.canDoAction();
- getReturnValue().getCanDoActionMessages()
- .add(VdcBllMessages.VAR__ACTION__CREATE.toString());
+ boolean result = true;
if (!isVdsGroupUnique(getVdsGroup().getName())) {
addCanDoActionMessage(VdcBllMessages.VDS_GROUP_CANNOT_DO_ACTION_NAME_IN_USE);
result = false;
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveVdsGroupCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveVdsGroupCommand.java
index ea97e56..60c09da 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveVdsGroupCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveVdsGroupCommand.java
@@ -26,9 +26,7 @@
@Override
protected boolean canDoAction() {
List<VmPool> list = null;
- boolean returnValue = super.canDoAction();
- getReturnValue().getCanDoActionMessages().add(
- VdcBllMessages.VAR__ACTION__REMOVE.toString());
+ boolean returnValue = true;
if (getVdsGroup() == null) {
addCanDoActionMessage(VdcBllMessages.VMT_CLUSTER_IS_NOT_VALID);
returnValue = false;
@@ -68,6 +66,12 @@
}
@Override
+ protected void setActionMessageParameters() {
+ addCanDoActionMessage(VdcBllMessages.VAR__TYPE__CLUSTER);
+ addCanDoActionMessage(VdcBllMessages.VAR__ACTION__REMOVE);
+ }
+
+ @Override
public AuditLogType getAuditLogTypeValue() {
return getSucceeded() ? AuditLogType.USER_REMOVE_VDS_GROUP
: AuditLogType.USER_REMOVE_VDS_GROUP_FAILED;
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVdsGroupCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVdsGroupCommand.java
index 49b8280..6bd9067 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVdsGroupCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVdsGroupCommand.java
@@ -387,7 +387,7 @@
@Override
protected void setActionMessageParameters() {
- addCanDoActionMessage(VdcBllMessages.VAR__TYPE__CLUSTER);
+ super.setActionMessageParameters();
addCanDoActionMessage(VdcBllMessages.VAR__ACTION__UPDATE);
}
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsGroupCommandBase.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsGroupCommandBase.java
index 466070b..419fa1d 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsGroupCommandBase.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsGroupCommandBase.java
@@ -8,7 +8,6 @@
import org.ovirt.engine.core.common.VdcObjectType;
import org.ovirt.engine.core.common.action.VdsGroupParametersBase;
import org.ovirt.engine.core.common.businessentities.VDSGroup;
-import org.ovirt.engine.core.common.errors.VdcBllMessages;
import org.ovirt.engine.core.compat.Guid;
public abstract class VdsGroupCommandBase<T extends VdsGroupParametersBase>
extends CommandBase<T> {
@@ -41,12 +40,6 @@
} else {
return null;
}
- }
-
- @Override
- protected boolean canDoAction() {
- addCanDoActionMessage(VdcBllMessages.VAR__TYPE__CLUSTER);
- return true;
}
@Override
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsGroupOperationCommandBase.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsGroupOperationCommandBase.java
index b3a2bf0..85082d1 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsGroupOperationCommandBase.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsGroupOperationCommandBase.java
@@ -17,6 +17,7 @@
import org.ovirt.engine.core.common.businessentities.VDSGroup;
import org.ovirt.engine.core.common.config.Config;
import org.ovirt.engine.core.common.config.ConfigValues;
+import org.ovirt.engine.core.common.errors.VdcBllMessages;
import org.ovirt.engine.core.common.scheduling.ClusterPolicy;
import
org.ovirt.engine.core.common.utils.customprop.SimpleCustomPropertiesUtil;
import org.ovirt.engine.core.common.utils.customprop.ValidationError;
@@ -48,6 +49,11 @@
return getParameters().getVdsGroup();
}
+ @Override
+ protected void setActionMessageParameters() {
+ addCanDoActionMessage(VdcBllMessages.VAR__TYPE__CLUSTER);
+ }
+
protected ArchitectureType getArchitecture() {
if (StringUtils.isNotEmpty(getVdsGroup().getcpu_name())) {
return
CpuFlagsManagerHandler.getArchitectureByCpuName(getVdsGroup().getcpu_name(),
--
To view, visit http://gerrit.ovirt.org/36176
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I3b67dfef6dc6b2bd254631b4ecb1e62b9504c86a
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Moti Asayag <masa...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
