Shubhendu Tripathi has uploaded a new change for review. Change subject: engine, webadmin: Disable add/remove bricks for EC volumes ......................................................................
engine, webadmin: Disable add/remove bricks for EC volumes Modified to disable the add/remove bricks options in UI for erasure encoded volumes. Change-Id: Id96714b4faea8f0f1c29cb5ef4426b8c4a2a7ffa Bug-Url: https://bugzilla.redhat.com/1221306 Signed-off-by: Shubhendu Tripathi <shtri...@redhat.com> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GlusterVolumeRemoveBricksCommand.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/gluster/VolumeBrickListModel.java 2 files changed, 9 insertions(+), 1 deletion(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/53/41053/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GlusterVolumeRemoveBricksCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GlusterVolumeRemoveBricksCommand.java index 57a8e26..f46ec64 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GlusterVolumeRemoveBricksCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GlusterVolumeRemoveBricksCommand.java @@ -56,7 +56,7 @@ if (getGlusterVolume().getVolumeType().isDispersedType()) { return failCanDoAction(VdcBllMessages.ACTION_TYPE_FAILED_REMOVE_BRICK_FROM_DISPERSE_VOLUME_NOT_SUPPORTED); } - if (getGlusterVolume().getVolumeType().isDispersedType()) { + if (getGlusterVolume().getVolumeType().isDistributedDispersedType()) { return failCanDoAction(VdcBllMessages.ACTION_TYPE_FAILED_REMOVE_BRICK_FROM_DISTRIBUTED_DISPERSE_VOLUME_NOT_SUPPORTED); } diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/gluster/VolumeBrickListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/gluster/VolumeBrickListModel.java index 50b5e7e..f14b3a6 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/gluster/VolumeBrickListModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/gluster/VolumeBrickListModel.java @@ -192,11 +192,13 @@ boolean allowRemove = true; boolean allowReplace = true; boolean allowAdvanced = true; + boolean allowAdd = true; if (volumeEntity == null || getSelectedItems() == null || getSelectedItems().size() == 0) { allowRemove = false; allowReplace = false; allowAdvanced = false; + allowAdd = false; } else { GlusterAsyncTask volumeTask = volumeEntity.getAsyncTask(); @@ -213,6 +215,11 @@ && (volumeEntity.getBricks().size() == VolumeListModel.REPLICATE_COUNT_DEFAULT || getSelectedItems().size() > 1)) { allowRemove = false; } + else if (volumeEntity.getVolumeType() == GlusterVolumeType.DISPERSE + || volumeEntity.getVolumeType() == GlusterVolumeType.DISTRIBUTED_DISPERSE) { + allowRemove = false; + allowAdd = false; + } if (getSelectedItems().size() == 1) { allowReplace = true; @@ -227,6 +234,7 @@ getRemoveBricksCommand().setIsExecutionAllowed(allowRemove); getReplaceBrickCommand().setIsExecutionAllowed(allowReplace); getBrickAdvancedDetailsCommand().setIsExecutionAllowed(allowAdvanced); + getAddBricksCommand().setIsExecutionAllowed(allowAdd); } public void updateRemoveBrickActionsAvailability(GlusterVolumeEntity volumeEntity) { -- To view, visit https://gerrit.ovirt.org/41053 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id96714b4faea8f0f1c29cb5ef4426b8c4a2a7ffa Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Shubhendu Tripathi <shtri...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
