anmolbabu has uploaded a new change for review. Change subject: Web - admin : Added a drop down menu for rebalance Added a drop down menu for rebalance Change-Id: Idf8e3478abaace95adc2a565cb3e7c95dd0e7780 Bug-Url: https://bugzilla.redhat.com/?????? Signed-off-by: Anmol Babu <[email protected]> ......................................................................
Web - admin : Added a drop down menu for rebalance Added a drop down menu for rebalance Change-Id: Idf8e3478abaace95adc2a565cb3e7c95dd0e7780 Bug-Url: https://bugzilla.redhat.com/?????? Signed-off-by: Anmol Babu <[email protected]> --- M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/volumes/VolumeListModel.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/ApplicationConstants.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabVolumeView.java 3 files changed, 39 insertions(+), 7 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/98/18298/1 diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/volumes/VolumeListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/volumes/VolumeListModel.java index 8267604..c2bb706 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/volumes/VolumeListModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/volumes/VolumeListModel.java @@ -133,7 +133,7 @@ setStopCommand(new UICommand("Stop", this)); //$NON-NLS-1$ setRebalanceCommand(new UICommand("Rebalance", this)); //$NON-NLS-1$ setOptimizeForVirtStoreCommand(new UICommand("OptimizeForVirtStore", this)); //$NON-NLS-1$ - getRebalanceCommand().setIsAvailable(false); + getRebalanceCommand().setIsAvailable(true); getRemoveVolumeCommand().setIsExecutionAllowed(false); getStartCommand().setIsExecutionAllowed(false); diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/ApplicationConstants.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/ApplicationConstants.java index 8e221ec..512d05e 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/ApplicationConstants.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/ApplicationConstants.java @@ -3185,4 +3185,14 @@ @DefaultStringValue("(Disabled)") String disabledPolicyUnit(); + + // Volume Rebalance + @DefaultStringValue("Start") + String startRebalance(); + + @DefaultStringValue("Stop") + String stopRebalance(); + + @DefaultStringValue("Status") + String statusRebalance(); } diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabVolumeView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabVolumeView.java index e88d353..1f02d77 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabVolumeView.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabVolumeView.java @@ -1,6 +1,8 @@ package org.ovirt.engine.ui.webadmin.section.main.view.tab; import java.util.Iterator; +import java.util.LinkedList; +import java.util.List; import org.ovirt.engine.core.common.businessentities.gluster.GlusterStatus; import org.ovirt.engine.core.common.businessentities.gluster.GlusterVolumeEntity; @@ -8,6 +10,8 @@ import org.ovirt.engine.core.common.businessentities.gluster.TransportType; import org.ovirt.engine.ui.common.idhandler.ElementIdHandler; import org.ovirt.engine.ui.common.uicommon.model.MainModelProvider; +import org.ovirt.engine.ui.common.widget.action.ActionButtonDefinition; +import org.ovirt.engine.ui.common.widget.action.CommandLocation; import org.ovirt.engine.ui.common.widget.table.column.EnumColumn; import org.ovirt.engine.ui.common.widget.table.column.TextColumnWithTooltip; import org.ovirt.engine.ui.uicommonweb.UICommand; @@ -18,6 +22,7 @@ import org.ovirt.engine.ui.webadmin.section.main.presenter.tab.MainTabVolumePresenter; import org.ovirt.engine.ui.webadmin.section.main.view.AbstractMainTabWithDetailsTableView; import org.ovirt.engine.ui.webadmin.widget.action.WebAdminButtonDefinition; +import org.ovirt.engine.ui.webadmin.widget.action.WebAdminMenuBarButtonDefinition; import org.ovirt.engine.ui.webadmin.widget.table.column.VolumeStatusColumn; import com.google.gwt.core.client.GWT; @@ -141,17 +146,34 @@ return getMainModel().getStopCommand(); } }); - getTable().addActionButton(new WebAdminButtonDefinition<GlusterVolumeEntity>(constants.rebalanceVolume()) { - @Override - protected UICommand resolveCommand() { - return getMainModel().getRebalanceCommand(); - } - }); getTable().addActionButton(new WebAdminButtonDefinition<GlusterVolumeEntity>(constants.optimizeForVirtStore()) { @Override protected UICommand resolveCommand() { return getMainModel().getOptimizeForVirtStoreCommand(); } }); + List<ActionButtonDefinition<GlusterVolumeEntity>> rebalanceSubctions = new LinkedList<ActionButtonDefinition<GlusterVolumeEntity>>(); + rebalanceSubctions.add(new WebAdminButtonDefinition<GlusterVolumeEntity>(constants.startRebalance()) { + @Override + protected UICommand resolveCommand() { + return getMainModel().getRebalanceCommand(); + } + }); + /* + rebalanceSubctions.add(new WebAdminButtonDefinition<GlusterVolumeEntity>(constants.stopRebalance()) { + @Override + protected UICommand resolveCommand() { + //return getMainModel().getRebalanceStopCommand(); + return null; + } + }); + rebalanceSubctions.add(new WebAdminButtonDefinition<GlusterVolumeEntity>(constants.statusRebalance()) { + @Override + protected UICommand resolveCommand() { + return null; + } + }); + */ + getTable().addActionButton(new WebAdminMenuBarButtonDefinition<GlusterVolumeEntity>(constants.rebalanceVolume(),rebalanceSubctions,CommandLocation.OnlyFromToolBar)); } } -- To view, visit http://gerrit.ovirt.org/18298 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Idf8e3478abaace95adc2a565cb3e7c95dd0e7780 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: anmolbabu <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
