Change in ovirt-engine[master]: core: Fix Remove Storage error message(#863097)

mlipchuk at redhat.com mlipchuk at redhat.com
Thu Dec 20 12:47:54 UTC 2012


Maor Lipchuk has submitted this change and it was merged.

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.

Adjusted and added tests, also added assert messages in
CommandAssertUtils.

Change-Id: I8b737545c0519cc2034bb6eec36afcc38da26059
Bug-Url: https://bugzilla.redhat.com/863097
Signed-off-by: Vered Volansky <vvolansk at redhat.com>
---
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/CommandAssertUtils.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
5 files changed, 34 insertions(+), 22 deletions(-)

Approvals:
  Maor Lipchuk: Looks good to me, approved
  Vered Volansky: Verified


--
To view, visit http://gerrit.ovirt.org/10265
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I8b737545c0519cc2034bb6eec36afcc38da26059
Gerrit-PatchSet: 3
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Vered Volansky <vvolansk at redhat.com>
Gerrit-Reviewer: Alissa Bonas <abonas at redhat.com>
Gerrit-Reviewer: Allon Mureinik <amureini at redhat.com>
Gerrit-Reviewer: Liron Aravot <laravot at redhat.com>
Gerrit-Reviewer: Maor Lipchuk <mlipchuk at redhat.com>
Gerrit-Reviewer: Vered Volansky <vvolansk at redhat.com>



More information about the Engine-commits mailing list