Tal Nisan has uploaded a new change for review. Change subject: webadmin: Added allocated size field in storage general sub tab ......................................................................
webadmin: Added allocated size field in storage general sub tab Change-Id: I6e43adf082fdeb034bb0bb66d6d339009897bf35 Bug-Url: https://bugzilla.redhat.com/962686 Signed-off-by: Tal Nisan <[email protected]> --- 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/storage/SubTabStorageGeneralView.java 2 files changed, 18 insertions(+), 9 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/37/15337/1 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 e891c2c..6648a13 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 @@ -1271,6 +1271,9 @@ @DefaultStringValue("Used") String usedStorageGeneral(); + @DefaultStringValue("Allocated") + String allocatedStorageGeneral(); + @DefaultStringValue("Over Allocation Ratio") String overAllocRatioStorageGeneral(); diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/storage/SubTabStorageGeneralView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/storage/SubTabStorageGeneralView.java index 2e19df8..405219f 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/storage/SubTabStorageGeneralView.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/storage/SubTabStorageGeneralView.java @@ -46,6 +46,10 @@ @Ignore // TODO Primitive getters not supported in 2.2 + DiskSizeLabel<Integer> allocatedSize = new DiskSizeLabel<Integer>(); + + @Ignore + // TODO Primitive getters not supported in 2.2 PercentLabel<Integer> overAllocationRatio = new PercentLabel<Integer>(); @Path("path") @@ -85,12 +89,13 @@ driver.initialize(this); // Build a form using the FormBuilder - formBuilder = new FormBuilder(formPanel, 1, 11); + formBuilder = new FormBuilder(formPanel, 1, 12); formBuilder.addFormItem(new FormItem(constants.sizeStorageGeneral(), totalSize, 0, 0)); formBuilder.addFormItem(new FormItem(constants.availableStorageGeneral(), availableSize, 1, 0)); formBuilder.addFormItem(new FormItem(constants.usedStorageGeneral(), usedSize, 2, 0)); - formBuilder.addFormItem(new FormItem(constants.overAllocRatioStorageGeneral(), overAllocationRatio, 3, 0) { + formBuilder.addFormItem(new FormItem(constants.allocatedStorageGeneral(), allocatedSize, 3, 0)); + formBuilder.addFormItem(new FormItem(constants.overAllocRatioStorageGeneral(), overAllocationRatio, 4, 0) { @Override public boolean getIsAvailable() { StorageDomain entity = (StorageDomain) getDetailModel().getEntity(); @@ -99,40 +104,40 @@ && !StorageDomainType.ImportExport.equals(storageDomainType); } }); - formBuilder.addFormItem(new FormItem(4, 0)); // empty cell - formBuilder.addFormItem(new FormItem(constants.pathStorageGeneral(), path, 5, 0) { + formBuilder.addFormItem(new FormItem(5, 0)); // empty cell + formBuilder.addFormItem(new FormItem(constants.pathStorageGeneral(), path, 6, 0) { @Override public boolean getIsAvailable() { return getDetailModel().getPath() != null; } }); - formBuilder.addFormItem(new FormItem(constants.vfsTypeStorageGeneral(), vfsType, 6, 0) { + formBuilder.addFormItem(new FormItem(constants.vfsTypeStorageGeneral(), vfsType, 7, 0) { @Override public boolean getIsAvailable() { return getDetailModel().getIsPosix() && getDetailModel().getVfsType() != null && !getDetailModel().getVfsType().isEmpty(); } }); - formBuilder.addFormItem(new FormItem(constants.mountOptionsGeneral(), mountOptions, 7, 0) { + formBuilder.addFormItem(new FormItem(constants.mountOptionsGeneral(), mountOptions, 8, 0) { @Override public boolean getIsAvailable() { return getDetailModel().getIsPosix() && getDetailModel().getMountOptions() != null && !getDetailModel().getMountOptions().isEmpty(); } }); - formBuilder.addFormItem(new FormItem(constants.nfsVersionGeneral(), nfsVersion, 8, 0) { + formBuilder.addFormItem(new FormItem(constants.nfsVersionGeneral(), nfsVersion, 9, 0) { @Override public boolean getIsAvailable() { return getDetailModel().getIsNfs() && getDetailModel().getNfsVersion() != null; } }); - formBuilder.addFormItem(new FormItem(constants.nfsRetransmissionsGeneral(), retransmissions, 9, 0) { + formBuilder.addFormItem(new FormItem(constants.nfsRetransmissionsGeneral(), retransmissions, 10, 0) { @Override public boolean getIsAvailable() { return getDetailModel().getIsNfs() && getDetailModel().getRetransmissions() != null; } }); - formBuilder.addFormItem(new FormItem(constants.nfsTimeoutGeneral(), timeout, 10, 0) { + formBuilder.addFormItem(new FormItem(constants.nfsTimeoutGeneral(), timeout, 11, 0) { @Override public boolean getIsAvailable() { return getDetailModel().getIsNfs() && getDetailModel().getTimeout() != null; @@ -149,6 +154,7 @@ totalSize.setValue(entity.getTotalDiskSize()); availableSize.setValue(entity.getAvailableDiskSize()); usedSize.setValue(entity.getUsedDiskSize()); + allocatedSize.setValue(entity.getCommittedDiskSize()); overAllocationRatio.setValue(entity.getStorageDomainOverCommitPercent()); } -- To view, visit http://gerrit.ovirt.org/15337 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I6e43adf082fdeb034bb0bb66d6d339009897bf35 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
