Tal Nisan has uploaded a new change for review. Change subject: webadmin: Added a number of VMs in clusters general details sub tab ......................................................................
webadmin: Added a number of VMs in clusters general details sub tab Change-Id: I679f4b44aec3614e3ec046affc7a6dc5437b26e4 Signed-off-by: Tal Nisan <[email protected]> Bug-Url: https://bugzilla.redhat.com/913234 --- 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/clusters/ClusterGeneralModel.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/cluster/ClusterGeneralModelForm.java 4 files changed, 35 insertions(+), 1 deletion(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/59/25859/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 b2bd9c0..8d1c71d 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 @@ -3658,6 +3658,11 @@ Frontend.getInstance().runQuery(VdcQueryType.GetNumberOfActiveVmsInVdsGroupByVdsGroupId, new IdQueryParameters(clusterId), aQuery); } + public static void getNumberOfVmsInCluster(AsyncQuery aQuery, Guid clusterId) { + Frontend.getInstance().runQuery(VdcQueryType.GetNumberOfVmsInVdsGroupByVdsGroupId, new IdQueryParameters(clusterId), + aQuery); + } + private static ArrayList<VDSGroup> getClusterByServiceList(ArrayList<VDSGroup> list, boolean supportsVirtService, boolean supportsGlusterService) { diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterGeneralModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterGeneralModel.java index e4beadd..19e4d98 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterGeneralModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterGeneralModel.java @@ -23,6 +23,7 @@ import org.ovirt.engine.core.common.queries.IdQueryParameters; import org.ovirt.engine.core.common.queries.VdcQueryReturnValue; import org.ovirt.engine.core.common.queries.VdcQueryType; +import org.ovirt.engine.core.common.utils.ObjectUtils; import org.ovirt.engine.core.compat.Guid; import org.ovirt.engine.ui.frontend.AsyncQuery; import org.ovirt.engine.ui.frontend.Frontend; @@ -46,6 +47,7 @@ private Integer noOfVolumesTotal; private Integer noOfVolumesUp; private Integer noOfVolumesDown; + private Integer numberOfVms; // set to true, if some hosts in the cluster has the console address overridden and some not private Boolean consoleAddressPartiallyOverridden = Boolean.FALSE; @@ -72,6 +74,18 @@ public void setNoOfVolumesDown(Integer noOfVolumesDown) { this.noOfVolumesDown = noOfVolumesDown; + } + + public String getNumberOfVms() { + return Integer.toString(numberOfVms); + } + + public void setNumberOfVms(Integer numberOfVms) { + if (!ObjectUtils.objectsEqual(this.numberOfVms, numberOfVms)) + { + this.numberOfVms = numberOfVms; + onPropertyChanged(new PropertyChangedEventArgs("numberOfVms")); //$NON-NLS-1$ + } } private GlusterServiceStatus glusterSwiftStatus; @@ -230,6 +244,13 @@ setEmulatedMachine(vdsGroup.getEmulatedMachine()); setCompatibilityVersion(vdsGroup.getcompatibility_version().getValue()); generateClusterType(vdsGroup.supportsGlusterService(), vdsGroup.supportsVirtService()); + AsyncDataProvider.getNumberOfVmsInCluster(new AsyncQuery(this, new INewAsyncCallback() { + @Override + public void onSuccess(Object model, Object returnValue) { + setNumberOfVms((Integer) ((VdcQueryReturnValue) returnValue).getReturnValue()); + } + }), vdsGroup.getId()); + } private void updateConsoleAddressPartiallyOverridden(VDSGroup cluster) { 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 f449735..c660c49 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 @@ -3055,6 +3055,9 @@ @DefaultStringValue("Resilience Policy") String resiliencePolicyCluster(); + @DefaultStringValue("Number of VMs") + String numberOfVmsCluster(); + @DefaultStringValue("Emulated Machine") String emulatedMachine(); diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/cluster/ClusterGeneralModelForm.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/cluster/ClusterGeneralModelForm.java index beffb26..e8baf21 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/cluster/ClusterGeneralModelForm.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/cluster/ClusterGeneralModelForm.java @@ -36,11 +36,14 @@ TextBoxLabel compatibilityVersion = new TextBoxLabel(); TextBoxLabel emulatedMachine = new TextBoxLabel(); + @Path("numberOfVms") + TextBoxLabel numberOfVms = new TextBoxLabel(); + private final Driver driver = GWT.create(Driver.class); public ClusterGeneralModelForm(ModelProvider<ClusterGeneralModel> modelProvider, final ApplicationConstants constants) { - super(modelProvider, 3, 5); + super(modelProvider, 3, 6); cpuThreads = new BooleanLabel(constants.yes(), constants.no()); memoryOverCommit = new PercentLabel<Integer>(); resiliencePolicy = new ResiliencePolicyLabel(constants); @@ -89,6 +92,8 @@ .withDefaultValue(constants.notAvailableLabel(), virtServiceNotSupported)); formBuilder.addFormItem(new FormItem(constants.emulatedMachine(), emulatedMachine, 4, 1, virtSupported) .withDefaultValue(constants.notAvailableLabel(), virtServiceNotSupported)); + formBuilder.addFormItem(new FormItem(constants.numberOfVmsCluster(), numberOfVms, 5, 1, virtSupported) + .withDefaultValue(constants.notAvailableLabel(), virtServiceNotSupported)); // properties for gluster support formBuilder.addFormItem(new FormItem(constants.clusterVolumesTotalLabel(), noOfVolumesTotal, 0, 2, glusterSupported) -- To view, visit http://gerrit.ovirt.org/25859 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I679f4b44aec3614e3ec046affc7a6dc5437b26e4 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Tal Nisan <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
