Vered Volansky has uploaded a new change for review. Change subject: core: Report storage size closer to reality ......................................................................
core: Report storage size closer to reality When storage size in GB is less than 1, "[N/A]" was displayed. Now displaying "<1", which is more accurate. Glance size initialization is amended to correspond to the new display (Should still show "[N/A]", but without amending would show "<1"). Change-Id: I758febd3b6b1a1f13ae4e48635bf185ea81d918b Bug-Url: https://bugzilla.redhat.com/1211057 Signed-off-by: Vered Volansky <vvola...@redhat.com> --- M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/StorageDomain.java M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/label/StorageSizeLabel.java M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/column/StorageSizeColumn.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabStorageView.java M packaging/dbscripts/inst_sp.sql A packaging/dbscripts/upgrade/03_05_1260_set_third_party_storage_size_to_NA.sql 6 files changed, 15 insertions(+), 23 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/26/39826/1 diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/StorageDomain.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/StorageDomain.java index 43c26d7..85e9fae 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/StorageDomain.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/StorageDomain.java @@ -202,7 +202,7 @@ if (available != null && used != null) { setTotalDiskSize(available + used); } else { - setTotalDiskSize(0); // GREGM prevents NPEs + setTotalDiskSize(null); } } @@ -214,10 +214,7 @@ } public void setTotalDiskSize(Integer value) { - value = (value == null) ? Integer.valueOf(0) : value; - if (!totalDiskSize.equals(value)) { - totalDiskSize = value; - } + totalDiskSize = value; } @Override diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/label/StorageSizeLabel.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/label/StorageSizeLabel.java index 3657fbb..554217b 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/label/StorageSizeLabel.java +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/label/StorageSizeLabel.java @@ -8,12 +8,7 @@ public class StorageSizeLabel<T extends Number> extends ValueLabel<T> { public StorageSizeLabel() { - super(new DiskSizeRenderer<T>(SizeConverter.SizeUnit.GB) { - @Override - protected boolean isUnavailable(T size) { - return size == null || size.longValue() == 0; - } - }); + super(new DiskSizeRenderer<T>(SizeConverter.SizeUnit.GB)); } } diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/column/StorageSizeColumn.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/column/StorageSizeColumn.java index 478e7b6..7f333a5 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/column/StorageSizeColumn.java +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/column/StorageSizeColumn.java @@ -6,12 +6,6 @@ public abstract class StorageSizeColumn<T> extends AbstractSizeColumn<T> { public StorageSizeColumn() { - super(new DiskSizeRenderer<Long>(SizeConverter.SizeUnit.GB) { - @Override - protected boolean isUnavailable(Long size) { - return size == null || size.longValue() == 0; - } - }); + super(new DiskSizeRenderer<Long>(SizeConverter.SizeUnit.GB)); } - } diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabStorageView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabStorageView.java index 8b8fde4..ad9dee2 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabStorageView.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabStorageView.java @@ -107,8 +107,8 @@ StorageSizeColumn<StorageDomain> totalSpaceColumn = new StorageSizeColumn<StorageDomain>() { @Override public Long getRawValue(StorageDomain object) { - long totalSpace = object.getTotalDiskSize() != null ? object.getTotalDiskSize() : 0; - return (long) totalSpace; + Integer totalSpace = object.getTotalDiskSize(); + return totalSpace == null ? null : Long.valueOf(totalSpace); } }; getTable().addColumn(totalSpaceColumn, constants.totalSpaceStorage(), "130px"); //$NON-NLS-1$ @@ -116,8 +116,8 @@ StorageSizeColumn<StorageDomain> freeSpaceColumn = new StorageSizeColumn<StorageDomain>() { @Override public Long getRawValue(StorageDomain object) { - long availableDiskSize = object.getAvailableDiskSize() != null ? object.getAvailableDiskSize() : 0; - return (long) availableDiskSize; + Integer availableDiskSize = object.getAvailableDiskSize(); + return availableDiskSize == null ? null : Long.valueOf(availableDiskSize); } }; freeSpaceColumn.makeSortable(StorageDomainFieldAutoCompleter.SIZE); diff --git a/packaging/dbscripts/inst_sp.sql b/packaging/dbscripts/inst_sp.sql index 338f584..20727e9 100644 --- a/packaging/dbscripts/inst_sp.sql +++ b/packaging/dbscripts/inst_sp.sql @@ -70,7 +70,7 @@ -- Adding a proper storage domain dynamic entry insert into storage_domain_dynamic(id, available_disk_size, used_disk_size) - select v_storage_domain_id, 0, 0 + select v_storage_domain_id, NULL, NULL where not exists (select id from storage_domain_dynamic where id = v_storage_domain_id); END; $procedure$ diff --git a/packaging/dbscripts/upgrade/03_05_1260_set_third_party_storage_size_to_NA.sql b/packaging/dbscripts/upgrade/03_05_1260_set_third_party_storage_size_to_NA.sql new file mode 100644 index 0000000..72a0f2e --- /dev/null +++ b/packaging/dbscripts/upgrade/03_05_1260_set_third_party_storage_size_to_NA.sql @@ -0,0 +1,6 @@ +UPDATE storage_domain_dynamic +SET available_disk_size = NULL, used_disk_size = NULL +FROM storage_domain_static, providers +WHERE storage_domain_dynamic.id = storage_domain_static.id AND + storage_domain_static.storage = CAST(providers.id AS VARCHAR) AND + provider_type IN ('OPENSTACK_IMAGE', 'OPENSTACK_VOLUME'); \ No newline at end of file -- To view, visit https://gerrit.ovirt.org/39826 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I758febd3b6b1a1f13ae4e48635bf185ea81d918b Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: ovirt-engine-3.5 Gerrit-Owner: Vered Volansky <vvola...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
