Change in ovirt-engine[master]: gluster: Reset statusconflict flag on enable/disable

[kmayilsa at redhat.com]

Kanagaraj M has submitted this change and it was merged.

Change subject: gluster: Reset statusconflict flag on enable/disable
......................................................................


gluster: Reset statusconflict flag on enable/disable

Reset the status conflict flag on enable/disable
of gluster hooks. After resetting of flag, if
conflict status is 0, remove the entries of
conflicting server hooks as conflicts have been
resolved

Removed code that added entries to server hooks
as we now only maintain conflicting server hook
entries

Refactored the command class to use
GlusterHookParameters class.

Change-Id: I9913900175e0f5be33bb1ec45b882e770a09fde4
Signed-off-by: Sahina Bose <sabose at redhat.com>
---
M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/DisableGlusterHookCommand.java
M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/EnableGlusterHookCommand.java
M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GlusterHookStatusChangeCommand.java
M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/AddGlusterHookCommandTest.java
M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/DisableGlusterHookCommandTest.java
M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/EnableGlusterHookCommandTest.java
M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/GlusterHookCommandTest.java
D backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/gluster/GlusterHookStatusChangeParameters.java
M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterGlusterHookListModel.java
9 files changed, 50 insertions(+), 137 deletions(-)

Approvals:
  Kanagaraj M: Verified; Looks good to me, approved


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

Gerrit-MessageType: merged
Gerrit-Change-Id: I9913900175e0f5be33bb1ec45b882e770a09fde4
Gerrit-PatchSet: 5
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Sahina Bose <sabose at redhat.com>
Gerrit-Reviewer: Kanagaraj M <kmayilsa at redhat.com>
Gerrit-Reviewer: Omer Frenkel <ofrenkel at redhat.com>
Gerrit-Reviewer: Sahina Bose <sabose at redhat.com>
Gerrit-Reviewer: Shubhendu Tripathi <shtripat at redhat.com>
Gerrit-Reviewer: oVirt Jenkins CI Server