anmolbabu has uploaded a new change for review. Change subject: webadmin : Allow Deletion of sub-volumes from distribute replicate volume ......................................................................
webadmin : Allow Deletion of sub-volumes from distribute replicate volume This patch allows Deletion of sub-volumes from distribute replicate volume Change-Id: Ib02785bc87af782a3d51c784bedac4e3d0e1b15a Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1031585 Signed-off-by: Anmol Babu <anb...@redhat.com> --- M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/gluster/VolumeBrickListModel.java 1 file changed, 19 insertions(+), 5 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/29/22229/1 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 4bcd600..87ab385 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 @@ -709,7 +709,10 @@ int replicaCount = removeBrickModel.getReplicaCount(); int distributions = brickList.size() / replicaCount; - if (selectedBricks.size() != replicaCount && selectedBricks.size() != distributions) + boolean isSubVolumeDeletion = false; + boolean isReplicaCountReduction = false; + + if (selectedBricks.size() == brickList.size()) { return false; } @@ -730,11 +733,22 @@ count++; } } - if (count == 1 && i == (distributions - 1)) + + if(((count == 0) || (count == replicaCount)) && (!isReplicaCountReduction)) { + isSubVolumeDeletion = true; + if(i == (distributions - 1)) { + return true; + } + } + + else if (count == 1 && (!isSubVolumeDeletion)) { - removeBrickModel.setReplicaCount(removeBrickModel.getReplicaCount() - 1); - removeBrickModel.setReduceReplica(true); - return true; + isReplicaCountReduction = true; + if (i == (distributions - 1)) { + removeBrickModel.setReplicaCount(removeBrickModel.getReplicaCount() - 1); + removeBrickModel.setReduceReplica(true); + return true; + } } else if (count > 1) { -- To view, visit http://gerrit.ovirt.org/22229 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib02785bc87af782a3d51c784bedac4e3d0e1b15a Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: anmolbabu <anb...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
