Shubhendu Tripathi has uploaded a new change for review. Change subject: webadmin: List only the cluster with nodes attached ......................................................................
webadmin: List only the cluster with nodes attached Modified to list only the clusters which have nodes attached during cluster volume snapshot configurations manipulation. Change-Id: I1d4dac68de44cecfc853b2388c23bfe3d1cc09cf Bug-Url: https://bugzilla.redhat.com/1202391 Signed-off-by: Shubhendu Tripathi <[email protected]> --- M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/dataprovider/AsyncDataProvider.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/volumes/VolumeListModel.java 2 files changed, 25 insertions(+), 4 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/97/40397/1 diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/dataprovider/AsyncDataProvider.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/dataprovider/AsyncDataProvider.java index d0076c1..b6115dc 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/dataprovider/AsyncDataProvider.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/dataprovider/AsyncDataProvider.java @@ -80,8 +80,6 @@ import org.ovirt.engine.core.common.businessentities.network.VmNetworkInterface; import org.ovirt.engine.core.common.businessentities.network.VnicProfileView; import org.ovirt.engine.core.common.businessentities.qos.QosType; -import org.ovirt.engine.core.common.console.ConsoleOptions.WanDisableEffects; -import org.ovirt.engine.core.common.console.ConsoleOptions.WanColorDepth; import org.ovirt.engine.core.common.businessentities.storage.CinderVolumeType; import org.ovirt.engine.core.common.businessentities.storage.Disk; import org.ovirt.engine.core.common.businessentities.storage.DiskImage; @@ -92,6 +90,8 @@ import org.ovirt.engine.core.common.businessentities.storage.StorageType; import org.ovirt.engine.core.common.businessentities.storage.VolumeFormat; import org.ovirt.engine.core.common.businessentities.storage.VolumeType; +import org.ovirt.engine.core.common.console.ConsoleOptions.WanColorDepth; +import org.ovirt.engine.core.common.console.ConsoleOptions.WanDisableEffects; import org.ovirt.engine.core.common.interfaces.SearchType; import org.ovirt.engine.core.common.mode.ApplicationMode; import org.ovirt.engine.core.common.queries.ArchCapabilitiesParameters; @@ -1947,6 +1947,25 @@ Frontend.getInstance().runQuery(VdcQueryType.GetClustersWithPermittedAction, getEntitiesWithPermittedActionParameters, aQuery); } + public void getClustersHavingHosts(AsyncQuery aQuery) { + aQuery.converterCallback = new IAsyncConverter() { + @Override + public Object Convert(Object source, AsyncQuery _asyncQuery) + { + if (source != null) + { + ArrayList<VDSGroup> list = (ArrayList<VDSGroup>) source; + Collections.sort(list, new NameableComparator()); + return list; + } + return new ArrayList<VDSGroup>(); + } + }; + Frontend.getInstance().runQuery(VdcQueryType.GetAllVdsGroupsHavingHosts, + new VdcQueryParametersBase(), + aQuery); + } + public void getAllVmTemplates(AsyncQuery aQuery, final boolean refresh) { aQuery.converterCallback = new TemplateConverter(); VdcQueryParametersBase params = new VdcQueryParametersBase(); 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 a227de4..2b1feed 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 @@ -1226,7 +1226,7 @@ .configureClusterSnapshotOptionsTitle()); setWindow(clusterSnapshotConfigModel); - AsyncDataProvider.getInstance().getClusterList(new AsyncQuery(this, new INewAsyncCallback() { + AsyncDataProvider.getInstance().getClustersHavingHosts(new AsyncQuery(this, new INewAsyncCallback() { @Override public void onSuccess(Object model, final Object returnValue) { @@ -1241,7 +1241,9 @@ @Override public void onSuccess(Object model, Object returnValue1) { - clusterSnapshotConfigModel.getClusters().setItems((List<VDSGroup>) returnValue, (VDSGroup) returnValue1); + clusterSnapshotConfigModel.getClusters() + .setItems((List<VDSGroup>) returnValue, + (VDSGroup) returnValue1); } }), volumeEntity.getClusterId()); } -- To view, visit https://gerrit.ovirt.org/40397 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I1d4dac68de44cecfc853b2388c23bfe3d1cc09cf Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Shubhendu Tripathi <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
