Alissa Bonas has uploaded a new change for review. Change subject: core: rename DiskImage method to a more clear name ......................................................................
core: rename DiskImage method to a more clear name Rename getActualSizeFromDiskImage to getActualSizeInBytes to reflect better what the method returns. Change-Id: Iaf26bda8e00c1ae2f12b1decf6e1b4a8d12bed31 Signed-off-by: Alissa Bonas <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/BaseImagesCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CreateImageTemplateCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ExportVmCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImagesHandler.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmTemplateCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/lsm/VmReplicateDiskFinishTaskHandler.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/DiskImage.java M backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/DiskMapper.java M backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfWriter.java M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/vm/VmDiskPopupWidget.java M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/vm/VmSnapshotInfoPanel.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/storage/backup/ImportVmPopupView.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/template/DisksTree.java 14 files changed, 30 insertions(+), 30 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/68/14768/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/BaseImagesCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/BaseImagesCommand.java index 8bc9dea..13200ce 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/BaseImagesCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/BaseImagesCommand.java @@ -238,7 +238,7 @@ getDestinationDiskImage().setLastModified(getDestinationDiskImage().getLastModifiedDate()); DiskImageDynamic destinationDiskDynamic = getDiskImageDynamicDAO().get(getDestinationDiskImage().getImageId()); if (destinationDiskDynamic != null) { - destinationDiskDynamic.setactual_size(fromIRS.getActualSizeFromDiskImage()); + destinationDiskDynamic.setactual_size(fromIRS.getActualSizeInBytes()); getDiskImageDynamicDAO().update(destinationDiskDynamic); } } @@ -255,7 +255,7 @@ getImageDao().save(image.getImage()); DiskImageDynamic diskDynamic = new DiskImageDynamic(); diskDynamic.setId(image.getImageId()); - diskDynamic.setactual_size(image.getActualSizeFromDiskImage()); + diskDynamic.setactual_size(image.getActualSizeInBytes()); getDiskImageDynamicDAO().save(diskDynamic); image_storage_domain_map image_storage_domain_map = new image_storage_domain_map(image.getImageId(), image.getStorageIds().get(0)); diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CreateImageTemplateCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CreateImageTemplateCommand.java index 6ac5dbd..dff4d85 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CreateImageTemplateCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CreateImageTemplateCommand.java @@ -79,7 +79,7 @@ DiskImageDynamic diskDynamic = new DiskImageDynamic(); diskDynamic.setId(newImage.getImageId()); - diskDynamic.setactual_size(getDiskImage().getActualSizeFromDiskImage()); + diskDynamic.setactual_size(getDiskImage().getActualSizeInBytes()); DbFacade.getInstance().getDiskImageDynamicDao().save(diskDynamic); setActionReturnValue(newImage); diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ExportVmCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ExportVmCommand.java index bcd1bc8..ab4d147 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ExportVmCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ExportVmCommand.java @@ -238,7 +238,7 @@ .getId(), diskImage.getImageId())); if (vdsReturnValue != null && vdsReturnValue.getSucceeded()) { DiskImage fromVdsm = (DiskImage) vdsReturnValue.getReturnValue(); - diskImage.setActualSizeFromDiskImage(fromVdsm.getActualSizeFromDiskImage()); + diskImage.setActualSizeFromDiskImage(fromVdsm.getActualSizeInBytes()); } AllVmImages.add(diskImage); } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImagesHandler.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImagesHandler.java index 02b34c4..b65873c 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImagesHandler.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImagesHandler.java @@ -304,7 +304,7 @@ DbFacade.getInstance().getImageDao().save(image.getImage()); DiskImageDynamic diskDynamic = new DiskImageDynamic(); diskDynamic.setId(image.getImageId()); - diskDynamic.setactual_size(image.getActualSizeFromDiskImage()); + diskDynamic.setactual_size(image.getActualSizeInBytes()); DbFacade.getInstance().getDiskImageDynamicDao().save(diskDynamic); if (imageStorageDomainMap != null) { DbFacade.getInstance().getImageStorageDomainMapDao().save(imageStorageDomainMap); diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmCommand.java index 9e01868..ed918d8 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmCommand.java @@ -725,7 +725,7 @@ protected void saveDiskImageDynamic(DiskImage disk) { DiskImageDynamic diskDynamic = new DiskImageDynamic(); diskDynamic.setId(disk.getImageId()); - diskDynamic.setactual_size(disk.getActualSizeFromDiskImage()); + diskDynamic.setactual_size(disk.getActualSizeInBytes()); getDiskImageDynamicDAO().save(diskDynamic); } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmTemplateCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmTemplateCommand.java index 8186694..2dd2fd3 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmTemplateCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmTemplateCommand.java @@ -338,7 +338,7 @@ DiskImageDynamic diskDynamic = new DiskImageDynamic(); diskDynamic.setId(image.getImageId()); - diskDynamic.setactual_size(image.getActualSizeFromDiskImage()); + diskDynamic.setactual_size(image.getActualSizeInBytes()); DbFacade.getInstance().getDiskImageDynamicDao().save(diskDynamic); getCompensationContext().snapshotNewEntity(diskDynamic); } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/lsm/VmReplicateDiskFinishTaskHandler.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/lsm/VmReplicateDiskFinishTaskHandler.java index 16d2031..c71ba60 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/lsm/VmReplicateDiskFinishTaskHandler.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/lsm/VmReplicateDiskFinishTaskHandler.java @@ -100,7 +100,7 @@ // Update image's actual size in DB if (imageFromIRS != null && diskImageDynamic != null) { - diskImageDynamic.setactual_size(imageFromIRS.getActualSizeFromDiskImage()); + diskImageDynamic.setactual_size(imageFromIRS.getActualSizeInBytes()); getDiskImageDynamicDao().update(diskImageDynamic); } } diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/DiskImage.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/DiskImage.java index 85209e1..7bc4a87 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/DiskImage.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/DiskImage.java @@ -139,13 +139,13 @@ this.lastModifiedDate = lastModifiedDate; } - public long getActualSizeFromDiskImage() { + public long getActualSizeInBytes() { return actualSizeFromDiskImageDynamic; } public void setActualSizeFromDiskImage(long size) { actualSizeFromDiskImageDynamic = size; - setActualSize(getActualSizeFromDiskImage() * 1.0 / (1024 * 1024 * 1024)); + setActualSize(getActualSizeInBytes() * 1.0 / (1024 * 1024 * 1024)); } public int getReadRate() { diff --git a/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/DiskMapper.java b/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/DiskMapper.java index 7383c61..06b43b9 100644 --- a/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/DiskMapper.java +++ b/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/DiskMapper.java @@ -149,7 +149,7 @@ } model.setSize(entity.getSize()); model.setProvisionedSize(entity.getSize()); - model.setActualSize(entity.getActualSizeFromDiskImage()); + model.setActualSize(entity.getActualSizeInBytes()); if (entity.getVolumeFormat() != null) { model.setFormat(map(entity.getVolumeFormat(), null)); } diff --git a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfWriter.java b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfWriter.java index 00864c6..bbec364 100644 --- a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfWriter.java +++ b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfWriter.java @@ -115,7 +115,7 @@ _writer.WriteAttributeString(OVF_URI, "size", String.valueOf(BytesToGigabyte(image.getSize()))); _writer.WriteAttributeString(OVF_URI, "actual_size", - String.valueOf(BytesToGigabyte(image.getActualSizeFromDiskImage()))); + String.valueOf(BytesToGigabyte(image.getActualSizeInBytes()))); _writer.WriteAttributeString(OVF_URI, "vm_snapshot_id", (image.getVmSnapshotId() != null) ? image .getVmSnapshotId().getValue().toString() : ""); diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/vm/VmDiskPopupWidget.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/vm/VmDiskPopupWidget.java index e8ff065..c3c9e1c 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/vm/VmDiskPopupWidget.java +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/vm/VmDiskPopupWidget.java @@ -339,7 +339,7 @@ @Override protected Long getRawValue(EntityModel object) { DiskImage diskImage = (DiskImage) (((DiskModel) (object.getEntity())).getDisk()); - return diskImage.getActualSizeFromDiskImage(); + return diskImage.getActualSizeInBytes(); } }; internalDiskTable.addColumn(actualSizeColumn, constants.sizeVmDiskTable(), "105px"); //$NON-NLS-1$ diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/vm/VmSnapshotInfoPanel.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/vm/VmSnapshotInfoPanel.java index 9b4ae0c..aed9f31 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/vm/VmSnapshotInfoPanel.java +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/vm/VmSnapshotInfoPanel.java @@ -137,7 +137,7 @@ DiskSizeColumn<DiskImage> actualSizeColumn = new DiskSizeColumn<DiskImage>() { @Override protected Long getRawValue(DiskImage object) { - return object.getActualSizeFromDiskImage(); + return object.getActualSizeInBytes(); } }; disksTable.addColumn(actualSizeColumn, constants.sizeDisk(), "70px"); //$NON-NLS-1$ diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/storage/backup/ImportVmPopupView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/storage/backup/ImportVmPopupView.java index 887c218..94fe26d 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/storage/backup/ImportVmPopupView.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/storage/backup/ImportVmPopupView.java @@ -415,7 +415,7 @@ DiskSizeColumn<DiskImage> actualSizeColumn = new DiskSizeColumn<DiskImage>() { @Override protected Long getRawValue(DiskImage object) { - return object.getActualSizeFromDiskImage(); + return object.getActualSizeInBytes(); } }; diskTable.addColumn(actualSizeColumn, constants.sizeDisk(), "100px"); //$NON-NLS-1$ diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/template/DisksTree.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/template/DisksTree.java index a820b8a..c5328a5 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/template/DisksTree.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/template/DisksTree.java @@ -29,36 +29,36 @@ import com.google.gwt.user.client.ui.TreeItem; public class DisksTree extends AbstractSubTabTree<TemplateDiskListModel, DiskImage, StorageDomain> { - + ApplicationResources resources; ApplicationConstants constants; - public DisksTree(ApplicationResources resources, ApplicationConstants constants, ApplicationTemplates templates) { + public DisksTree(ApplicationResources resources, ApplicationConstants constants, ApplicationTemplates templates) { super(resources, constants, templates); this.resources = (ApplicationResources) resources; this.constants = (ApplicationConstants) constants; - setRootSelectionEnabled(true); - } - + setRootSelectionEnabled(true); + } + @Override protected TreeItem getRootItem(DiskImage disk) { HorizontalPanel panel = new HorizontalPanel(); - panel.setSpacing(1); + panel.setSpacing(1); panel.setWidth("100%"); //$NON-NLS-1$ addItemToPanel(panel, new Image(resources.diskImage()), "25px"); //$NON-NLS-1$ addTextBoxToPanel(panel, new TextBoxLabel(), disk.getDiskAlias(), ""); //$NON-NLS-1$ - addValueLabelToPanel(panel, new DiskSizeLabel<Long>(), disk.getSizeInGigabytes(), "120px"); //$NON-NLS-1$ - addValueLabelToPanel(panel, new DiskSizeLabel<Long>(DiskSizeUnit.BYTE), disk.getActualSizeFromDiskImage(), "120px"); //$NON-NLS-1$ + addValueLabelToPanel(panel, new DiskSizeLabel<Long>(), disk.getSizeInGigabytes(), "120px"); //$NON-NLS-1$ + addValueLabelToPanel(panel, new DiskSizeLabel<Long>(DiskSizeUnit.BYTE), disk.getActualSizeInBytes(), "120px"); //$NON-NLS-1$ addValueLabelToPanel(panel, new EnumLabel<ImageStatus>(), disk.getImageStatus(), "120px"); //$NON-NLS-1$ addValueLabelToPanel(panel, new EnumLabel<VolumeType>(), disk.getVolumeType(), "120px"); //$NON-NLS-1$ - addValueLabelToPanel(panel, new EnumLabel<DiskInterface>(), disk.getDiskInterface(), "120px"); //$NON-NLS-1$ + addValueLabelToPanel(panel, new EnumLabel<DiskInterface>(), disk.getDiskInterface(), "120px"); //$NON-NLS-1$ addValueLabelToPanel(panel, new DateLabel(), disk.getCreationDate(), "90px"); //$NON-NLS-1$ - TreeItem treeItem = new TreeItem(panel); - treeItem.setUserObject(disk.getId()); - return treeItem; + TreeItem treeItem = new TreeItem(panel); + treeItem.setUserObject(disk.getId()); + return treeItem; } @Override @@ -75,9 +75,9 @@ addValueLabelToPanel(panel, new DiskSizeLabel<Integer>(), storage.getUsedDiskSize(), "120px"); //$NON-NLS-1$ addValueLabelToPanel(panel, new DiskSizeLabel<Integer>(), storage.getTotalDiskSize(), "120px"); //$NON-NLS-1$ - TreeItem treeItem = new TreeItem(panel); - treeItem.setUserObject(storage.getId()); - return treeItem; + TreeItem treeItem = new TreeItem(panel); + treeItem.setUserObject(storage.getId()); + return treeItem; } @Override -- To view, visit http://gerrit.ovirt.org/14768 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iaf26bda8e00c1ae2f12b1decf6e1b4a8d12bed31 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Alissa Bonas <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
