Vered Volansky has uploaded a new change for review.
Change subject: core: Fix Remove Storage error message(#863097)
......................................................................
core: Fix Remove Storage error message(#863097)
setActionMessageParameters() was not set for RemoveStorageDomainCommand,
nor for base class StorageDomainCommandBase().
When the lock could not be acquired in CommandBase.acquireLockInternal()
both VAR__TYPE__STORAGE__DOMAIN and VAR__ACTION__REMOVE were not added
to the VdcBllMessages, resulting in ${action} and ${type} appearing in
the error message.
This patch implements setActionMessageParameters() in
StorageDomainCommandBase and in RemoveStorageDomainCommand, and removes
the setting of VAR__TYPE__STORAGE__DOMAIN and VAR__ACTION__REMOVE in
other flows, as it is not needed there anymore.
Change-Id: I8b737545c0519cc2034bb6eec36afcc38da26059
Bug-Url: https://bugzilla.redhat.com/863097
Signed-off-by: Vered Volansky <[email protected]>
---
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/RemoveStorageDomainCommand.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/StorageDomainCommandBase.java
M
backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/RemoveStorageDomainCommandTest.java
M
backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/RemoveStorageDomainTest.java
4 files changed, 26 insertions(+), 12 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/65/10265/1
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/RemoveStorageDomainCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/RemoveStorageDomainCommand.java
index 63e5d8e..9d10f8c 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/RemoveStorageDomainCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/RemoveStorageDomainCommand.java
@@ -2,6 +2,7 @@
import java.util.Collections;
import java.util.Map;
+
import org.ovirt.engine.core.bll.LockIdNameAttribute;
import org.ovirt.engine.core.bll.NonTransactiveCommandAttribute;
import org.ovirt.engine.core.common.AuditLogType;
@@ -75,6 +76,12 @@
}
@Override
+ protected void setActionMessageParameters() {
+ super.setActionMessageParameters();
+ addCanDoActionMessage(VdcBllMessages.VAR__ACTION__REMOVE);
+ }
+
+ @Override
protected boolean canDoAction() {
if (!super.canDoAction()) {
return false;
@@ -89,8 +96,6 @@
VDS vds = getVds();
boolean format = getParameters().getDoFormat();
boolean localFs = isLocalFs(dom);
-
- addCanDoActionMessage(VdcBllMessages.VAR__ACTION__REMOVE);
if (!checkStorageDomain() ||
!checkStorageDomainSharedStatusNotLocked(dom)) {
return false;
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/StorageDomainCommandBase.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/StorageDomainCommandBase.java
index 21c4423..b259f38 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/StorageDomainCommandBase.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/StorageDomainCommandBase.java
@@ -14,12 +14,12 @@
import org.ovirt.engine.core.common.businessentities.LUNs;
import org.ovirt.engine.core.common.businessentities.StorageDomainStatus;
import org.ovirt.engine.core.common.businessentities.StorageDomainType;
+import org.ovirt.engine.core.common.businessentities.StoragePoolIsoMap;
import org.ovirt.engine.core.common.businessentities.StoragePoolIsoMapId;
+import org.ovirt.engine.core.common.businessentities.StorageServerConnections;
import org.ovirt.engine.core.common.businessentities.StorageType;
import org.ovirt.engine.core.common.businessentities.storage_domains;
import org.ovirt.engine.core.common.businessentities.storage_pool;
-import org.ovirt.engine.core.common.businessentities.StoragePoolIsoMap;
-import org.ovirt.engine.core.common.businessentities.StorageServerConnections;
import org.ovirt.engine.core.common.config.Config;
import org.ovirt.engine.core.common.config.ConfigValues;
import org.ovirt.engine.core.compat.Guid;
@@ -31,8 +31,8 @@
import org.ovirt.engine.core.dao.DiskImageDynamicDAO;
import org.ovirt.engine.core.dao.ImageDao;
import org.ovirt.engine.core.dao.ImageStorageDomainMapDao;
-import org.ovirt.engine.core.dao.SnapshotDao;
import org.ovirt.engine.core.dao.LunDAO;
+import org.ovirt.engine.core.dao.SnapshotDao;
import org.ovirt.engine.core.dao.StorageDomainStaticDAO;
import org.ovirt.engine.core.dao.StoragePoolIsoMapDAO;
import org.ovirt.engine.core.dao.StorageServerConnectionDAO;
@@ -143,8 +143,12 @@
}
@Override
- protected boolean canDoAction() {
+ protected void setActionMessageParameters() {
addCanDoActionMessage(VdcBllMessages.VAR__TYPE__STORAGE__DOMAIN);
+ }
+
+ @Override
+ protected boolean canDoAction() {
return super.canDoAction();
}
diff --git
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/RemoveStorageDomainCommandTest.java
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/RemoveStorageDomainCommandTest.java
index cf23344..1f1ee55 100644
---
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/RemoveStorageDomainCommandTest.java
+++
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/RemoveStorageDomainCommandTest.java
@@ -51,13 +51,17 @@
// All the mock DAOs return nulls (which mocks the objects do not
exist)
// canDoAction should return false, not crash with NullPointerExcpetion
assertFalse("canDoActtion shouldn't be possible for a non-existant
storage domain", command.canDoAction());
+ command.setActionMessageParameters();
List<String> messages =
command.getReturnValue().getCanDoActionMessages();
- assertEquals("Wrong number of messages", 2, messages.size());
- assertEquals("Wrong message",
- VdcBllMessages.VAR__TYPE__STORAGE__DOMAIN.name(),
- messages.get(0));
+ assertEquals("Wrong number of messages", 3, messages.size());
assertEquals("Wrong message",
VdcBllMessages.ACTION_TYPE_FAILED_STORAGE_DOMAIN_NOT_EXIST.name(),
+ messages.get(0));
+ assertEquals("Wrong message",
+ VdcBllMessages.VAR__TYPE__STORAGE__DOMAIN.name(),
messages.get(1));
+ assertEquals("Wrong message",
+ VdcBllMessages.VAR__ACTION__REMOVE.name(),
+ messages.get(2));
}
}
diff --git
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/RemoveStorageDomainTest.java
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/RemoveStorageDomainTest.java
index 6a5e76b..e7a3d8e 100644
---
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/RemoveStorageDomainTest.java
+++
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/RemoveStorageDomainTest.java
@@ -23,14 +23,14 @@
import org.ovirt.engine.core.common.action.VdcActionType;
import org.ovirt.engine.core.common.action.VdcReturnValueBase;
import org.ovirt.engine.core.common.businessentities.StorageDomainSharedStatus;
+import org.ovirt.engine.core.common.businessentities.StorageDomainStatic;
import org.ovirt.engine.core.common.businessentities.StorageDomainType;
+import org.ovirt.engine.core.common.businessentities.StoragePoolIsoMap;
import org.ovirt.engine.core.common.businessentities.StoragePoolIsoMapId;
import org.ovirt.engine.core.common.businessentities.StorageType;
import org.ovirt.engine.core.common.businessentities.VDS;
-import org.ovirt.engine.core.common.businessentities.StorageDomainStatic;
import org.ovirt.engine.core.common.businessentities.storage_domains;
import org.ovirt.engine.core.common.businessentities.storage_pool;
-import org.ovirt.engine.core.common.businessentities.StoragePoolIsoMap;
import org.ovirt.engine.core.common.interfaces.VDSBrokerFrontend;
import
org.ovirt.engine.core.common.vdscommands.FormatStorageDomainVDSCommandParameters;
import org.ovirt.engine.core.common.vdscommands.VDSCommandType;
@@ -83,6 +83,7 @@
assertTrue(cmd.canDoAction());
checkSucceeded(cmd, false);
+ cmd.setActionMessageParameters();
checkMessages(cmd,
VdcBllMessages.VAR__TYPE__STORAGE__DOMAIN,
VdcBllMessages.VAR__ACTION__REMOVE);
--
To view, visit http://gerrit.ovirt.org/10265
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I8b737545c0519cc2034bb6eec36afcc38da26059
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Vered Volansky <[email protected]>
_______________________________________________
Engine-patches mailing list
[email protected]
http://lists.ovirt.org/mailman/listinfo/engine-patches
