Maor Lipchuk has uploaded a new change for review. Change subject: webadmin: DisksViewColumns - support Cinder ......................................................................
webadmin: DisksViewColumns - support Cinder DiskStorageType - support CINDER DiskStorageType in relevant columns. Change-Id: I2803cc160fcd4ab31b8bb8c4298e9307ef534802 Bug-Url: https://bugzilla.redhat.com/1185826 Signed-off-by: Maor Lipchuk <mlipc...@redhat.com> --- M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/disks/DisksViewColumns.java 1 file changed, 16 insertions(+), 8 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/43/39043/1 diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/disks/DisksViewColumns.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/disks/DisksViewColumns.java index 0a02b4a..6d519fc 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/disks/DisksViewColumns.java +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/disks/DisksViewColumns.java @@ -212,7 +212,8 @@ public static final AbstractTextColumn<Disk> storageTypeColumn = new AbstractEnumColumn<Disk, StorageType>() { @Override protected StorageType getRawValue(Disk object) { - if (object.getDiskStorageType() != DiskStorageType.IMAGE) { + if (object.getDiskStorageType() != DiskStorageType.IMAGE && + object.getDiskStorageType() != DiskStorageType.CINDER) { return null; } DiskImage disk = (DiskImage) object; @@ -225,9 +226,12 @@ AbstractDiskSizeColumn<Disk> column = new AbstractDiskSizeColumn<Disk>() { @Override protected Long getRawValue(Disk object) { - return object.getDiskStorageType() == DiskStorageType.IMAGE ? - ((DiskImage) object).getSize() : - (long) (((LunDisk) object).getLun().getDeviceSize() * Math.pow(1024, 3)); + switch (object.getDiskStorageType()) { + case LUN: + return (long) (((LunDisk) object).getLun().getDeviceSize() * Math.pow(1024, 3)); + default: + return object.getSize(); + } } }; @@ -238,7 +242,8 @@ AbstractDiskSizeColumn<Disk> column = new AbstractDiskSizeColumn<Disk>(SizeConverter.SizeUnit.GB) { @Override protected Long getRawValue(Disk object) { - return object.getDiskStorageType() == DiskStorageType.IMAGE ? + return object.getDiskStorageType() == DiskStorageType.IMAGE || + object.getDiskStorageType() == DiskStorageType.CINDER ? Math.round(((DiskImage) object).getActualDiskWithSnapshotsSize()) : (long) (((LunDisk) object).getLun().getDeviceSize()); } @@ -251,7 +256,8 @@ AbstractTextColumn<Disk> column = new AbstractEnumColumn<Disk, VolumeType>() { @Override protected VolumeType getRawValue(Disk object) { - return object.getDiskStorageType() == DiskStorageType.IMAGE ? + return object.getDiskStorageType() == DiskStorageType.IMAGE || + object.getDiskStorageType() == DiskStorageType.CINDER ? ((DiskImage) object).getVolumeType() : null; } }; @@ -274,7 +280,8 @@ AbstractTextColumn<Disk> column = new AbstractFullDateTimeColumn<Disk>() { @Override protected Date getRawValue(Disk object) { - return object.getDiskStorageType() == DiskStorageType.IMAGE ? + return object.getDiskStorageType() == DiskStorageType.IMAGE || + object.getDiskStorageType() == DiskStorageType.CINDER ? ((DiskImage) object).getCreationDate() : null; } }; @@ -286,7 +293,8 @@ AbstractTextColumn<Disk> column = new AbstractEnumColumn<Disk, ImageStatus>() { @Override protected ImageStatus getRawValue(Disk object) { - return object.getDiskStorageType() == DiskStorageType.IMAGE ? + return object.getDiskStorageType() == DiskStorageType.IMAGE || + object.getDiskStorageType() == DiskStorageType.CINDER ? ((DiskImage) object).getImageStatus() : null; } }; -- To view, visit https://gerrit.ovirt.org/39043 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I2803cc160fcd4ab31b8bb8c4298e9307ef534802 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Maor Lipchuk <mlipc...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
