Tal Nisan has uploaded a new change for review.
Change subject: webadmin: Fix actual snapshot disk size in storage tab (#847812)
......................................................................
webadmin: Fix actual snapshot disk size in storage tab (#847812)
The actual size column in storage VM's subtab did not appear correctly
due to the size reported in gigabytes yet treated as bytes
Change-Id: I79f24cd1368e1c6c2ce338c89e397d8bec4f176a
Signed-off-by: Tal Nisan <tni...@redhat.com>
---
M
frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/storage/VMsTree.java
1 file changed, 4 insertions(+), 4 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/63/8063/1
diff --git
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/storage/VMsTree.java
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/storage/VMsTree.java
index 5197393..ee68c5e 100644
---
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/storage/VMsTree.java
+++
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/storage/VMsTree.java
@@ -76,7 +76,7 @@
protected ArrayList<Disk> getNodeObjects(VM vm) {
ArrayList<Disk> disks = new ArrayList<Disk>();
for (Disk disk : vm.getDiskMap().values()) {
- disks.add((Disk) disk);
+ disks.add(disk);
}
return disks;
}
@@ -110,7 +110,7 @@
addTextBoxToPanel(panel, new TextBoxLabel(), "", "80px");
//$NON-NLS-1$ //$NON-NLS-2$
addTextBoxToPanel(panel, new TextBoxLabel(), "", "160px");
//$NON-NLS-1$ //$NON-NLS-2$
addValueLabelToPanel(panel, new DiskSizeLabel<Long>(),
disk.getSizeInGigabytes(), "110px"); //$NON-NLS-1$
- addValueLabelToPanel(panel, new DiskSizeLabel<Double>(),
disk.getActualDiskWithSnapshotsSize(), "110px"); //$NON-NLS-1$
+ addValueLabelToPanel(panel, new
DiskSizeLabel<Double>(DiskSizeUnit.GIGABYTE), disk.getActualSize(), "110px");
//$NON-NLS-1$
addValueLabelToPanel(panel, new FullDateTimeLabel(),
disk.getcreation_date(), "140px"); //$NON-NLS-1$
panel.setSpacing(1);
@@ -146,12 +146,12 @@
boolean isDiskImage = disk.getDiskStorageType() ==
DiskStorageType.IMAGE;
Double actualSize =
isDiskImage ? ((DiskImage)
disk).getActualDiskWithSnapshotsSize()
- : (long) (((LunDisk)
disk).getLun().getDeviceSize() * Math.pow(1024, 3));
+ : (long) (((LunDisk)
disk).getLun().getDeviceSize());
Long virtualSize = isDiskImage ? ((DiskImage) disk).getsize() :
(long) (((LunDisk) disk).getLun().getDeviceSize() *
Math.pow(1024, 3));
addValueLabelToPanel(panel, new
DiskSizeLabel<Long>(DiskSizeUnit.BYTE), virtualSize, "110px"); //$NON-NLS-1$
- addValueLabelToPanel(panel, new
DiskSizeLabel<Double>(DiskSizeUnit.BYTE), actualSize, "110px"); //$NON-NLS-1$
+ addValueLabelToPanel(panel, new
DiskSizeLabel<Double>(DiskSizeUnit.GIGABYTE), actualSize, "110px");
//$NON-NLS-1$
addValueLabelToPanel(panel, new FullDateTimeLabel(),
disk.getDiskStorageType() == DiskStorageType.IMAGE ?
((DiskImage) disk).getcreation_date() : null, "140px");
//$NON-NLS-1$
--
To view, visit http://gerrit.ovirt.org/8063
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I79f24cd1368e1c6c2ce338c89e397d8bec4f176a
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Tal Nisan <tni...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
