Yair Zaslavsky has uploaded a new change for review.
Change subject: core: DiskImage should be a status aware business entity
......................................................................
core: DiskImage should be a status aware business entity
Change-Id: Ie107839c34b3e5950fd6fe9c8f31da8836775b55
Signed-off-by: Yair Zaslavsky <yzasl...@redhat.com>
---
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddImageFromScratchCommand.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmAndCloneImageCommand.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AttachDiskToVmCommand.java
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/ExportRepoImageCommand.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetDiskAlignmentCommand.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/ImportRepoImageCopyTaskHandler.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportRepoImageCreateTaskHandler.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MoveImageGroupCommand.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MoveOrCopyDiskCommand.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/OvfDataUpdater.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveAllVmImagesCommand.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveDiskCommand.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveDiskSnapshotTaskHandler.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveImageCommand.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveSnapshotSingleDiskLiveCommand.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RestoreAllSnapshotsCommand.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmDiskCommand.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmTemplateCommand.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/snapshots/SnapshotVmConfigurationHelper.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/snapshots/SnapshotsManager.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/validator/DiskImagesValidator.java
M
backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/AddVmCommandTest.java
M
backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/AddVmFromSnapshotCommandTest.java
M
backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/AddVmFromTemplateCommandTest.java
M
backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/ExportRepoImageCommandTest.java
M
backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/GetAllDisksByVmIdQueryTest.java
M
backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/GetDiskAlignmentCommandTest.java
M
backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/ImportExportRepoImageCommandTest.java
M
backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/ImportVmCommandTest.java
M
backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/MoveOrCopyDiskCommandTest.java
M
backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/OvfDataUpdaterTest.java
M
backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/RemoveDiskCommandTest.java
M
backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/RemoveImageCommandTest.java
M
backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/VmHandlerTest.java
M
backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/snapshots/SnapshotVmConfigurationHelperTest.java
M
backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/validator/DiskImagesValidatorTest.java
M
backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/validator/DiskSnapshotsValidatorTest.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/DiskImage.java
M
backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/DiskImageDAODbFacadeImpl.java
M
backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/ImageDaoTest.java
M
backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/AbstractBackendDisksResourceTest.java
M
backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendDiskResourceTest.java
M
backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendDisksResourceTest.java
M
backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendExportDomainDisksResourceTest.java
M
backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendStorageDomainDiskResourceTest.java
M
backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendStorageDomainDisksResourceTest.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/OvfReader.java
M
backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/GetImageInfoVDSCommand.java
M
frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/column/DiskImageStatusColumn.java
M
frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/column/DiskStatusColumn.java
M
frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/disks/DisksViewColumns.java
M
frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/AbstractVmPopupWidget.java
M
frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/vm/VmSnapshotCustomPreviewPopupWidget.java
M
frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/template/TemplateDiskListModelTable.java
M
frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/vm/VmSnapshotInfoPanel.java
M
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/disks/DiskListModel.java
M
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/StorageDiskListModel.java
M
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/StorageSnapshotListModel.java
M
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/TemplateDiskListModel.java
M
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/TemplateStorageListModel.java
M
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmDiskListModel.java
M
frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/storage/RegisterEntityInfoPanel.java
M
frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/template/DisksTree.java
M
frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/template/StoragesTree.java
67 files changed, 112 insertions(+), 110 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/12/35412/1
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddImageFromScratchCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddImageFromScratchCommand.java
index dde13b5..b57136a 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddImageFromScratchCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddImageFromScratchCommand.java
@@ -63,7 +63,7 @@
newDiskImage.setCreationDate(new Date());
newDiskImage.setLastModified(new Date());
newDiskImage.setActive(true);
- newDiskImage.setImageStatus(ImageStatus.LOCKED);
+ newDiskImage.setStatus(ImageStatus.LOCKED);
newDiskImage.setVmSnapshotId(getParameters().getVmSnapshotId());
newDiskImage.setQuotaId(getParameters().getQuotaId());
newDiskImage.setDiskProfileId(getParameters().getDiskProfileId());
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmAndCloneImageCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmAndCloneImageCommand.java
index c9fd579..e28541f 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmAndCloneImageCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmAndCloneImageCommand.java
@@ -402,7 +402,7 @@
// For illegal image check if it was snapshot as illegal
(therefore
// still exists at DB, or was it erased after snapshot -
therefore the
// query returned to UI an illegal image)
- if (diskImage.getImageStatus() == ImageStatus.ILLEGAL) {
+ if (diskImage.getStatus() == ImageStatus.ILLEGAL) {
DiskImage snapshotImageInDb =
getDiskImageDao().getSnapshotById(diskImage.getImageId());
if (snapshotImageInDb == null) {
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AttachDiskToVmCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AttachDiskToVmCommand.java
index 1821dd3..7d40d36 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AttachDiskToVmCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AttachDiskToVmCommand.java
@@ -83,11 +83,11 @@
//after inspecting upgrade
Disk activeDisk = loadActiveDisk(disk.getId());
- if (((DiskImage) activeDisk).getImageStatus() ==
ImageStatus.ILLEGAL) {
+ if (((DiskImage) activeDisk).getStatus() == ImageStatus.ILLEGAL) {
return
failCanDoAction(VdcBllMessages.ACTION_TYPE_FAILED_ILLEGAL_DISK_OPERATION);
}
- if (((DiskImage) disk).getImageStatus() == ImageStatus.LOCKED) {
+ if (((DiskImage) disk).getStatus() == ImageStatus.LOCKED) {
addCanDoActionMessage(VdcBllMessages.ACTION_TYPE_FAILED_DISKS_LOCKED);
addCanDoActionMessageVariable("diskAliases",
disk.getDiskAlias());
return false;
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 4ec4c93..d000196 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
@@ -308,8 +308,8 @@
protected void setImageStatus(ImageStatus imageStatus) {
DiskImage diskImage = getRelevantDiskImage();
- if (diskImage != null && diskImage.getImageStatus() != imageStatus) {
- diskImage.setImageStatus(imageStatus);
+ if (diskImage != null && diskImage.getStatus() != imageStatus) {
+ diskImage.setStatus(imageStatus);
ImagesHandler.updateImageStatus(diskImage.getImage().getId(),
imageStatus);
}
}
@@ -349,7 +349,7 @@
newImageId, newImageGroupId, newStorageDomainID);
} finally {
if (!getParameters().isLeaveLocked()) {
- getDestinationDiskImage().setImageStatus(ImageStatus.OK);
+ getDestinationDiskImage().setStatus(ImageStatus.OK);
}
getImageDao().update(getDestinationDiskImage().getImage());
}
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ExportRepoImageCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ExportRepoImageCommand.java
index 17e8d73..6c3d7cc 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ExportRepoImageCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ExportRepoImageCommand.java
@@ -85,13 +85,13 @@
}
protected void acquireImageDbLock() {
- getDiskImage().setImageStatus(ImageStatus.LOCKED);
- ImagesHandler.updateImageStatus(getDiskImage().getImageId(),
getDiskImage().getImageStatus());
+ getDiskImage().setStatus(ImageStatus.LOCKED);
+ ImagesHandler.updateImageStatus(getDiskImage().getImageId(),
getDiskImage().getStatus());
}
protected void releaseImageDbLock() {
- getDiskImage().setImageStatus(ImageStatus.OK);
- ImagesHandler.updateImageStatus(getDiskImage().getImageId(),
getDiskImage().getImageStatus());
+ getDiskImage().setStatus(ImageStatus.OK);
+ ImagesHandler.updateImageStatus(getDiskImage().getImageId(),
getDiskImage().getStatus());
}
@Override
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetDiskAlignmentCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetDiskAlignmentCommand.java
index 809a1da..b45f2867 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetDiskAlignmentCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetDiskAlignmentCommand.java
@@ -210,7 +210,7 @@
public Void runInTransaction() {
getCompensationContext().snapshotEntityStatus(diskImage.getImage());
getCompensationContext().stateChanged();
- diskImage.setImageStatus(ImageStatus.LOCKED);
+ diskImage.setStatus(ImageStatus.LOCKED);
ImagesHandler.updateImageStatus(diskImage.getImageId(),
ImageStatus.LOCKED);
return null;
}});
@@ -221,7 +221,7 @@
if (isImageExclusiveLockNeeded()) {
final DiskImage diskImage = (DiskImage) getDisk();
- diskImage.setImageStatus(ImageStatus.OK);
+ diskImage.setStatus(ImageStatus.OK);
ImagesHandler.updateImageStatus(diskImage.getImageId(),
ImageStatus.OK);
}
}
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 fcbeff6..5a82c9e 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
@@ -712,7 +712,7 @@
List<DiskImage> diskSnapshots =
DbFacade.getInstance().getDiskImageDao().getAllSnapshotsForImageGroup(diskId);
for (DiskImage diskSnapshot : diskSnapshots) {
- diskSnapshot.setImageStatus(statusForCompensation);
+ diskSnapshot.setStatus(statusForCompensation);
compensationContext.snapshotEntityStatus(diskSnapshot.getImage());
}
}
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportRepoImageCopyTaskHandler.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportRepoImageCopyTaskHandler.java
index be78860..367a7c1 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportRepoImageCopyTaskHandler.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportRepoImageCopyTaskHandler.java
@@ -98,7 +98,7 @@
attachDiskToTemplate(newTemplateId);
}
}
-
getEnclosingCommand().getParameters().getDiskImage().setImageStatus(ImageStatus.OK);
+
getEnclosingCommand().getParameters().getDiskImage().setStatus(ImageStatus.OK);
ImagesHandler.updateImageStatus(
getEnclosingCommand().getParameters().getDestinationImageId(),
ImageStatus.OK);
getEnclosingCommand().getReturnValue().setSucceeded(true);
@@ -157,7 +157,7 @@
@Override
public void endWithFailure() {
super.endWithFailure();
-
getEnclosingCommand().getParameters().getDiskImage().setImageStatus(ImageStatus.ILLEGAL);
+
getEnclosingCommand().getParameters().getDiskImage().setStatus(ImageStatus.ILLEGAL);
ImagesHandler.updateImageStatus(
getEnclosingCommand().getParameters().getDestinationImageId(),
ImageStatus.ILLEGAL);
}
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportRepoImageCreateTaskHandler.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportRepoImageCreateTaskHandler.java
index 7e727b7..c6b82ae 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportRepoImageCreateTaskHandler.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportRepoImageCreateTaskHandler.java
@@ -86,10 +86,10 @@
@Override
public void endWithFailure() {
-
enclosingCommand.getParameters().getDiskImage().setImageStatus(ImageStatus.ILLEGAL);
+
enclosingCommand.getParameters().getDiskImage().setStatus(ImageStatus.ILLEGAL);
ImagesHandler.updateImageStatus(
enclosingCommand.getParameters().getDiskImage().getImageId(),
-
enclosingCommand.getParameters().getDiskImage().getImageStatus());
+ enclosingCommand.getParameters().getDiskImage().getStatus());
compensate();
enclosingCommand.getReturnValue().setSucceeded(true);
}
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MoveImageGroupCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MoveImageGroupCommand.java
index 527838b..c451ca7 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MoveImageGroupCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MoveImageGroupCommand.java
@@ -49,7 +49,7 @@
protected void lockImage() {
ImagesHandler.updateAllDiskImageSnapshotsStatusWithCompensation(getRelevantDiskImage().getId(),
ImageStatus.LOCKED,
- getRelevantDiskImage().getImageStatus(),
+ getRelevantDiskImage().getStatus(),
getCompensationContext());
}
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MoveOrCopyDiskCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MoveOrCopyDiskCommand.java
index 56679d0..b2bc964 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MoveOrCopyDiskCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MoveOrCopyDiskCommand.java
@@ -117,7 +117,7 @@
protected boolean isImageNotLocked() {
DiskImage diskImage = getImage();
- if (diskImage.getImageStatus() == ImageStatus.LOCKED) {
+ if (diskImage.getStatus() == ImageStatus.LOCKED) {
if (getParameters().getOperation() == ImageOperation.Move) {
return
failCanDoAction(VdcBllMessages.ACTION_TYPE_FAILED_DISKS_LOCKED,
String.format("$%1$s %2$s", "diskAliases",
diskImage.getDiskAlias()));
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/OvfDataUpdater.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/OvfDataUpdater.java
index 03e6e3a..46b5740 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/OvfDataUpdater.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/OvfDataUpdater.java
@@ -440,7 +440,7 @@
*/
protected boolean verifyImagesStatus(List<DiskImage> diskImages) {
for (DiskImage diskImage : diskImages) {
- if (diskImage.getImageStatus() == ImageStatus.LOCKED) {
+ if (diskImage.getStatus() == ImageStatus.LOCKED) {
return false;
}
}
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveAllVmImagesCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveAllVmImagesCommand.java
index ad20141..471f327 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveAllVmImagesCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveAllVmImagesCommand.java
@@ -115,7 +115,7 @@
getDbFacade().getDiskImageDao().getAllSnapshotsForImageGroup(diskImage.getId());
for (DiskImage diskSnapshot : snapshotDisks) {
diskSnapshot.setVmSnapshotId(null);
- diskSnapshot.setImageStatus(ImageStatus.ILLEGAL);
+ diskSnapshot.setStatus(ImageStatus.ILLEGAL);
getDbFacade().getImageDao().update(diskSnapshot.getImage());
}
}
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveDiskCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveDiskCommand.java
index 03a59e3..9816922 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveDiskCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveDiskCommand.java
@@ -143,7 +143,7 @@
retValue && validate(validator.isDomainExistAndActive())
&& validate(validator.domainIsValidDestination());
- if (retValue && diskImage.getImageStatus() == ImageStatus.LOCKED) {
+ if (retValue && diskImage.getStatus() == ImageStatus.LOCKED) {
retValue = false;
addCanDoActionMessage(VdcBllMessages.ACTION_TYPE_FAILED_OBJECT_LOCKED);
}
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveDiskSnapshotTaskHandler.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveDiskSnapshotTaskHandler.java
index 2c87b7a..856d0ee 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveDiskSnapshotTaskHandler.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveDiskSnapshotTaskHandler.java
@@ -102,7 +102,7 @@
endRemoveSnapshotSingleDisk(false);
// Unlock all images since failure aborts the entire job
Disk disk = DbFacade.getInstance().getDiskDao().get(imageGroupId);
- if (((DiskImage) disk).getImageStatus() == ImageStatus.LOCKED) {
+ if (((DiskImage) disk).getStatus() == ImageStatus.LOCKED) {
updateImagesStatus(ImageStatus.OK);
}
enclosingCommand.preventRollback();
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveImageCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveImageCommand.java
index 9c6c14f..420fe39 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveImageCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveImageCommand.java
@@ -269,7 +269,7 @@
new
ImageStorageDomainMapId(getParameters().getImageId(),
getParameters().getStorageDomainId()));
ImagesHandler.updateAllDiskImageSnapshotsStatus(getRelevantDiskImage().getId(),
- getRelevantDiskImage().getImageStatus());
+ getRelevantDiskImage().getStatus());
return null;
}});
}
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveSnapshotSingleDiskLiveCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveSnapshotSingleDiskLiveCommand.java
index 902aebe..8cedcab 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveSnapshotSingleDiskLiveCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveSnapshotSingleDiskLiveCommand.java
@@ -258,7 +258,7 @@
topImage.setvolumeFormat(baseImage.getVolumeFormat());
topImage.setVolumeType(baseImage.getVolumeType());
topImage.setParentId(baseImage.getParentId());
- topImage.setImageStatus(ImageStatus.OK);
+ topImage.setStatus(ImageStatus.OK);
getBaseDiskDao().update(topImage);
getImageDao().update(topImage.getImage());
@@ -289,7 +289,7 @@
topImage.getImage().setActive(baseImage.getImage().isActive());
baseImage.getImage().setActive(oldTopIsActive);
- topImage.setImageStatus(ImageStatus.OK);
+ topImage.setStatus(ImageStatus.OK);
getBaseDiskDao().update(topImage);
getImageDao().update(topImage.getImage());
updateDiskImageDynamic(topImage);
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RestoreAllSnapshotsCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RestoreAllSnapshotsCommand.java
index 805a93a..a48f665 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RestoreAllSnapshotsCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RestoreAllSnapshotsCommand.java
@@ -105,7 +105,7 @@
boolean succeeded = true;
for (DiskImage image : imagesToRestore) {
- if (image.getImageStatus() != ImageStatus.ILLEGAL) {
+ if (image.getStatus() != ImageStatus.ILLEGAL) {
ImagesContainterParametersBase params = new
RestoreFromSnapshotParameters(image.getImageId(),
getVmId(), getSnapshot(), removedSnapshotId);
VdcReturnValueBase returnValue =
runAsyncTask(VdcActionType.RestoreFromSnapshot, params);
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmDiskCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmDiskCommand.java
index 032675c..c889314 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmDiskCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmDiskCommand.java
@@ -354,8 +354,8 @@
if (disk.getDiskStorageType() == DiskStorageType.IMAGE) {
DiskImage diskImage = (DiskImage) disk;
diskImage.setQuotaId(getQuotaId());
- if (unlockImage && diskImage.getImageStatus() ==
ImageStatus.LOCKED) {
- diskImage.setImageStatus(ImageStatus.OK);
+ if (unlockImage && diskImage.getStatus() ==
ImageStatus.LOCKED) {
+ diskImage.setStatus(ImageStatus.OK);
}
getImageDao().update(diskImage.getImage());
updateQuota(diskImage);
@@ -671,7 +671,7 @@
public Void runInTransaction() {
getCompensationContext().snapshotEntityStatus(diskImage.getImage());
getCompensationContext().stateChanged();
- diskImage.setImageStatus(ImageStatus.LOCKED);
+ diskImage.setStatus(ImageStatus.LOCKED);
ImagesHandler.updateImageStatus(diskImage.getImageId(),
ImageStatus.LOCKED);
return null;
}
@@ -680,7 +680,7 @@
private void unlockImageInDb() {
final DiskImage diskImage = (DiskImage) getOldDisk();
- diskImage.setImageStatus(ImageStatus.OK);
+ diskImage.setStatus(ImageStatus.OK);
ImagesHandler.updateImageStatus(diskImage.getImageId(),
ImageStatus.OK);
}
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmTemplateCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmTemplateCommand.java
index f964b29..a4c4b36 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmTemplateCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmTemplateCommand.java
@@ -104,7 +104,7 @@
} else {
if (vmtImages != null) {
for (DiskImage image : vmtImages) {
- if (image.getImageStatus() == ImageStatus.LOCKED) {
+ if (image.getStatus() == ImageStatus.LOCKED) {
returnValue = false;
break;
}
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/snapshots/SnapshotVmConfigurationHelper.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/snapshots/SnapshotVmConfigurationHelper.java
index 9caa149..53cdec6 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/snapshots/SnapshotVmConfigurationHelper.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/snapshots/SnapshotVmConfigurationHelper.java
@@ -107,12 +107,12 @@
log.debug("Image '{}' of Disk '{}' cannot be found in
database. This image will be returned as ILLEGAL from the query",
fromConfigImg.getImageId(),
fromConfigImg.getId());
- fromConfigImg.setImageStatus(ImageStatus.ILLEGAL);
+ fromConfigImg.setStatus(ImageStatus.ILLEGAL);
}
else {
// Return image status as appears in DB (needed in case status
is ILLEGAL in DB)
DiskImage imageInDb =
imagesInDbMap.get(fromConfigImg.getImageId());
- fromConfigImg.setImageStatus(imageInDb.getImageStatus());
+ fromConfigImg.setStatus(imageInDb.getStatus());
}
}
}
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/snapshots/SnapshotsManager.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/snapshots/SnapshotsManager.java
index 99734d6..48d2406 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/snapshots/SnapshotsManager.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/snapshots/SnapshotsManager.java
@@ -410,7 +410,7 @@
*/
public void removeAllIllegalDisks(Guid snapshotId, Guid vmId) {
for (DiskImage diskImage :
getDiskImageDao().getAllSnapshotsForVmSnapshot(snapshotId)) {
- if (diskImage.getImageStatus() == ImageStatus.ILLEGAL) {
+ if (diskImage.getStatus() == ImageStatus.ILLEGAL) {
ImagesHandler.removeDiskImage(diskImage, vmId);
}
}
@@ -658,7 +658,7 @@
} else {
// If can't find the image, insert it as illegal so that it
can't be used and make the device unplugged.
if (getDiskImageDao().getSnapshotById(diskImage.getImageId())
== null) {
- diskImage.setImageStatus(ImageStatus.ILLEGAL);
+ diskImage.setStatus(ImageStatus.ILLEGAL);
diskImage.setVmSnapshotId(activeSnapshotId);
ImagesHandler.addImage(diskImage, true,
(diskImage.getStorageIds() == null) ? null :
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/validator/DiskImagesValidator.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/validator/DiskImagesValidator.java
index c0dc06a..d18af37 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/validator/DiskImagesValidator.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/validator/DiskImagesValidator.java
@@ -120,7 +120,7 @@
private ValidationResult diskImagesNotInStatus(ImageStatus status,
VdcBllMessages failMessage) {
List<String> disksInStatus = new ArrayList<String>();
for (DiskImage diskImage : diskImages) {
- if (diskImage.getImageStatus() == status) {
+ if (diskImage.getStatus() == status) {
disksInStatus.add(diskImage.getDiskAlias());
}
}
@@ -231,7 +231,7 @@
public ValidationResult disksInStatus(ImageStatus applicableStatus,
VdcBllMessages message) {
for (DiskImage diskImage : diskImages) {
- if (diskImage.getImageStatus() != applicableStatus) {
+ if (diskImage.getStatus() != applicableStatus) {
return new ValidationResult(message,
String.format("$status %s", applicableStatus.name()));
}
diff --git
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/AddVmCommandTest.java
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/AddVmCommandTest.java
index 049cf6b..0286263 100644
---
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/AddVmCommandTest.java
+++
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/AddVmCommandTest.java
@@ -650,7 +650,7 @@
diskImage.setId(diskId);
diskImage.setImageId(Guid.newGuid());
diskImage.setParentId(Guid.newGuid());
- diskImage.setImageStatus(ImageStatus.OK);
+ diskImage.setStatus(ImageStatus.OK);
disksList.add(diskImage);
}
return disksList;
diff --git
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/AddVmFromSnapshotCommandTest.java
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/AddVmFromSnapshotCommandTest.java
index ba66f30..06a2c8a 100644
---
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/AddVmFromSnapshotCommandTest.java
+++
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/AddVmFromSnapshotCommandTest.java
@@ -115,7 +115,7 @@
diskImage.setId(diskId);
diskImage.setImageId(Guid.newGuid());
diskImage.setParentId(Guid.newGuid());
- diskImage.setImageStatus(ImageStatus.OK);
+ diskImage.setStatus(ImageStatus.OK);
disksList.add(diskImage);
}
return disksList;
diff --git
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/AddVmFromTemplateCommandTest.java
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/AddVmFromTemplateCommandTest.java
index b109a158..2f4acdf 100644
---
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/AddVmFromTemplateCommandTest.java
+++
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/AddVmFromTemplateCommandTest.java
@@ -83,7 +83,7 @@
diskImage.setId(diskId);
diskImage.setImageId(Guid.newGuid());
diskImage.setParentId(Guid.newGuid());
- diskImage.setImageStatus(ImageStatus.OK);
+ diskImage.setStatus(ImageStatus.OK);
disksList.add(diskImage);
}
return disksList;
diff --git
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/ExportRepoImageCommandTest.java
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/ExportRepoImageCommandTest.java
index 22e578c..d2b9997 100644
---
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/ExportRepoImageCommandTest.java
+++
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/ExportRepoImageCommandTest.java
@@ -89,7 +89,7 @@
@Test
public void testCanDoActionImageLocked() {
- getDiskImage().setImageStatus(ImageStatus.LOCKED);
+ getDiskImage().setStatus(ImageStatus.LOCKED);
CanDoActionTestUtils.runAndAssertCanDoActionFailure(cmd,
VdcBllMessages.ACTION_TYPE_FAILED_DISKS_LOCKED);
}
diff --git
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/GetAllDisksByVmIdQueryTest.java
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/GetAllDisksByVmIdQueryTest.java
index 1f0f17f..aeaaa17 100644
---
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/GetAllDisksByVmIdQueryTest.java
+++
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/GetAllDisksByVmIdQueryTest.java
@@ -137,7 +137,7 @@
di.setId(Guid.newGuid());
di.setImageId(Guid.newGuid());
di.setParentId(Guid.newGuid());
- di.setImageStatus(ImageStatus.OK);
+ di.setStatus(ImageStatus.OK);
return di;
}
@@ -147,7 +147,7 @@
di.setId(diskId);
di.setImageId(Guid.newGuid());
di.setParentId(Guid.newGuid());
- di.setImageStatus(ImageStatus.OK);
+ di.setStatus(ImageStatus.OK);
return di;
}
diff --git
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/GetDiskAlignmentCommandTest.java
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/GetDiskAlignmentCommandTest.java
index 0ecb107..23cfc69 100644
---
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/GetDiskAlignmentCommandTest.java
+++
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/GetDiskAlignmentCommandTest.java
@@ -92,7 +92,7 @@
disk = new DiskImage();
disk.setId(diskId);
disk.setVmEntityType(VmEntityType.VM);
- disk.setImageStatus(ImageStatus.OK);
+ disk.setStatus(ImageStatus.OK);
disk.setStorageIds(new
ArrayList<Guid>(Arrays.asList(storageDomainId)));
vm = new VM();
@@ -150,7 +150,7 @@
@Test
public void testCanDoActionImageIsLocked() {
- disk.setImageStatus(ImageStatus.LOCKED);
+ disk.setStatus(ImageStatus.LOCKED);
CanDoActionTestUtils.runAndAssertCanDoActionFailure(cmd,
VdcBllMessages.ACTION_TYPE_FAILED_DISKS_LOCKED);
}
diff --git
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/ImportExportRepoImageCommandTest.java
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/ImportExportRepoImageCommandTest.java
index 7b8f14d..5136d87 100644
---
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/ImportExportRepoImageCommandTest.java
+++
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/ImportExportRepoImageCommandTest.java
@@ -158,7 +158,7 @@
diskImage.setId(diskImageId);
diskImage.setStorageIds(new
ArrayList<>(Arrays.asList(storageDomainId)));
diskImage.setStoragePoolId(storagePoolId);
- diskImage.setImageStatus(ImageStatus.OK);
+ diskImage.setStatus(ImageStatus.OK);
when(storageDomainDao.get(repoStorageDomainId)).thenReturn(imageStorageDomain);
when(storageDomainDao.getAllForStorageDomain(storageDomainId))
diff --git
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/ImportVmCommandTest.java
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/ImportVmCommandTest.java
index 085d27b..75bf6ba 100644
---
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/ImportVmCommandTest.java
+++
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/ImportVmCommandTest.java
@@ -278,7 +278,7 @@
diskImage.setId(Guid.newGuid());
diskImage.setImageId(Guid.newGuid());
diskImage.setParentId(Guid.newGuid());
- diskImage.setImageStatus(ImageStatus.OK);
+ diskImage.setStatus(ImageStatus.OK);
disksList.add(diskImage);
}
return disksList;
diff --git
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/MoveOrCopyDiskCommandTest.java
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/MoveOrCopyDiskCommandTest.java
index 2c0c141..f47d43b 100644
---
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/MoveOrCopyDiskCommandTest.java
+++
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/MoveOrCopyDiskCommandTest.java
@@ -145,7 +145,7 @@
initializeCommand(ImageOperation.Move);
initVmDiskImage();
initVmForFail();
- command.getImage().setImageStatus(ImageStatus.LOCKED);
+ command.getImage().setStatus(ImageStatus.LOCKED);
doReturn(vmDeviceDao).when(command).getVmDeviceDAO();
assertFalse(command.canDoAction());
assertTrue(command.getReturnValue().getCanDoActionMessages().contains(
@@ -165,7 +165,7 @@
public void canDoActionTemplateImageIsLocked() throws Exception {
initializeCommand(ImageOperation.Copy);
initTemplateDiskImage();
- command.getImage().setImageStatus(ImageStatus.LOCKED);
+ command.getImage().setStatus(ImageStatus.LOCKED);
doReturn(new VmTemplate()).when(command).getTemplateForImage();
command.defineVmTemplate();
diff --git
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/OvfDataUpdaterTest.java
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/OvfDataUpdaterTest.java
index 8597a74..d23369f 100644
---
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/OvfDataUpdaterTest.java
+++
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/OvfDataUpdaterTest.java
@@ -432,7 +432,7 @@
private DiskImage createDiskImage(ImageStatus status, Guid poolId) {
DiskImage disk = new DiskImage();
disk.setId(Guid.newGuid());
- disk.setImageStatus(status);
+ disk.setStatus(status);
ArrayList<Guid> storageIds = new ArrayList<>();
Map<Guid, Pair<List<StorageDomainOvfInfo>, StorageDomain>> domains =
poolDomainsOvfInfo.get(poolId);
storageIds.add(domains.keySet().iterator().next());
diff --git
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/RemoveDiskCommandTest.java
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/RemoveDiskCommandTest.java
index e5bd2fc..0db33cd 100644
---
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/RemoveDiskCommandTest.java
+++
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/RemoveDiskCommandTest.java
@@ -95,7 +95,7 @@
@Test
public void testCanDoActionOvfDiskNotIllegal() {
- disk.setImageStatus(ImageStatus.OK);
+ disk.setStatus(ImageStatus.OK);
disk.setOvfStore(true);
CanDoActionTestUtils.runAndAssertCanDoActionFailure(cmd,
VdcBllMessages.ACTION_TYPE_FAILED_OVF_DISK_NOT_IN_APPLICABLE_STATUS);
diff --git
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/RemoveImageCommandTest.java
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/RemoveImageCommandTest.java
index ca7d555..6b7a83d 100644
---
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/RemoveImageCommandTest.java
+++
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/RemoveImageCommandTest.java
@@ -168,7 +168,7 @@
disk.setPlugged(Boolean.TRUE);
disk.setReadOnly(Boolean.FALSE);
disk.setVmSnapshotId(snapshotId);
- disk.setImageStatus(ImageStatus.OK);
+ disk.setStatus(ImageStatus.OK);
disk.setAppList("");
disk.setDescription("");
vm.getDiskList().add(disk);
diff --git
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/VmHandlerTest.java
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/VmHandlerTest.java
index 29d8c0e..1c39ba2 100644
---
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/VmHandlerTest.java
+++
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/VmHandlerTest.java
@@ -172,7 +172,7 @@
di.setId(Guid.newGuid());
di.setImageId(Guid.newGuid());
di.setParentId(Guid.newGuid());
- di.setImageStatus(ImageStatus.OK);
+ di.setStatus(ImageStatus.OK);
return di;
}
}
diff --git
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/snapshots/SnapshotVmConfigurationHelperTest.java
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/snapshots/SnapshotVmConfigurationHelperTest.java
index 7de9ac2..5a0e64c 100644
---
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/snapshots/SnapshotVmConfigurationHelperTest.java
+++
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/snapshots/SnapshotVmConfigurationHelperTest.java
@@ -90,7 +90,7 @@
snapshotVmConfigurationHelper.markImagesIllegalIfNotInDb(existingVm,
existingSnapshotId);
for (Disk diskImage : existingVm.getDiskMap().values()) {
- assertEquals(((DiskImage)diskImage).getImageStatus(),
ImageStatus.ILLEGAL);
+ assertEquals(((DiskImage)diskImage).getStatus(),
ImageStatus.ILLEGAL);
}
}
}
diff --git
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/validator/DiskImagesValidatorTest.java
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/validator/DiskImagesValidatorTest.java
index 619794c..c2ce349 100644
---
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/validator/DiskImagesValidatorTest.java
+++
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/validator/DiskImagesValidatorTest.java
@@ -88,7 +88,7 @@
disk.setId(Guid.newGuid());
disk.setDiskAlias(RandomUtils.instance().nextString(10));
disk.setActive(true);
- disk.setImageStatus(ImageStatus.OK);
+ disk.setStatus(ImageStatus.OK);
ArrayList<Guid> storageDomainIds = new ArrayList<>();
storageDomainIds.add(Guid.newGuid());
disk.setStorageIds(storageDomainIds);
@@ -114,22 +114,22 @@
@Test
public void diskImagesNotIllegalFirstIllegal() {
- disk1.setImageStatus(ImageStatus.ILLEGAL);
+ disk1.setStatus(ImageStatus.ILLEGAL);
assertThat(validator.diskImagesNotIllegal(),
both(failsWith(VdcBllMessages.ACTION_TYPE_FAILED_DISKS_ILLEGAL)).and(replacements(hasItem(createAliasReplacements(disk1)))));
}
@Test
public void diskImagesNotIllegalSecondtIllegal() {
- disk2.setImageStatus(ImageStatus.ILLEGAL);
+ disk2.setStatus(ImageStatus.ILLEGAL);
assertThat(validator.diskImagesNotIllegal(),
both(failsWith(VdcBllMessages.ACTION_TYPE_FAILED_DISKS_ILLEGAL)).and(replacements(hasItem(createAliasReplacements(disk2)))));
}
@Test
public void diskImagesNotIllegalBothIllegal() {
- disk1.setImageStatus(ImageStatus.ILLEGAL);
- disk2.setImageStatus(ImageStatus.ILLEGAL);
+ disk1.setStatus(ImageStatus.ILLEGAL);
+ disk2.setStatus(ImageStatus.ILLEGAL);
assertThat(validator.diskImagesNotIllegal(),
both(failsWith(VdcBllMessages.ACTION_TYPE_FAILED_DISKS_ILLEGAL)).and(replacements
(hasItem(createAliasReplacements(disk1, disk2)))));
@@ -200,22 +200,22 @@
@Test
public void diskImagesNotLockedFirstLocked() {
- disk1.setImageStatus(ImageStatus.LOCKED);
+ disk1.setStatus(ImageStatus.LOCKED);
assertThat(validator.diskImagesNotLocked(),
both(failsWith(VdcBllMessages.ACTION_TYPE_FAILED_DISKS_LOCKED)).and(replacements(hasItem(createAliasReplacements(disk1)))));
}
@Test
public void diskImagesNotLockedSecondtLocked() {
- disk2.setImageStatus(ImageStatus.LOCKED);
+ disk2.setStatus(ImageStatus.LOCKED);
assertThat(validator.diskImagesNotLocked(),
both(failsWith(VdcBllMessages.ACTION_TYPE_FAILED_DISKS_LOCKED)).and(replacements(hasItem(createAliasReplacements(disk2)))));
}
@Test
public void diskImagesNotLockedBothLocked() {
- disk1.setImageStatus(ImageStatus.LOCKED);
- disk2.setImageStatus(ImageStatus.LOCKED);
+ disk1.setStatus(ImageStatus.LOCKED);
+ disk2.setStatus(ImageStatus.LOCKED);
assertThat(validator.diskImagesNotLocked(),
both(failsWith(VdcBllMessages.ACTION_TYPE_FAILED_DISKS_LOCKED)).and(replacements
(hasItem(createAliasReplacements(disk1, disk2)))));
diff --git
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/validator/DiskSnapshotsValidatorTest.java
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/validator/DiskSnapshotsValidatorTest.java
index 8ec520a..0969129 100644
---
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/validator/DiskSnapshotsValidatorTest.java
+++
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/validator/DiskSnapshotsValidatorTest.java
@@ -54,7 +54,7 @@
DiskImage disk = new DiskImage();
disk.setImageId(Guid.newGuid());
disk.setActive(true);
- disk.setImageStatus(ImageStatus.OK);
+ disk.setStatus(ImageStatus.OK);
ArrayList<Guid> storageDomainIds = new ArrayList<>();
storageDomainIds.add(Guid.newGuid());
disk.setStorageIds(storageDomainIds);
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 4e3a7bb..785809d 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
@@ -8,7 +8,7 @@
import org.ovirt.engine.core.common.utils.SizeConverter;
import org.ovirt.engine.core.compat.Guid;
-public class DiskImage extends DiskImageBase implements IImage {
+public class DiskImage extends DiskImageBase implements IImage,
BusinessEntityWithStatus<Guid, ImageStatus> {
private static final long serialVersionUID = 3185087852755356847L;
@@ -193,11 +193,13 @@
getImage().setParentId(parentId);
}
- public ImageStatus getImageStatus() {
+ @Override
+ public ImageStatus getStatus() {
return getImage().getStatus();
}
- public void setImageStatus(ImageStatus imageStatus) {
+ @Override
+ public void setStatus(ImageStatus imageStatus) {
getImage().setStatus(imageStatus);
}
@@ -452,7 +454,7 @@
di.appList = diskImage.appList;
di.setImageTemplateId(diskImage.getImageTemplateId());
di.setParentId(diskImage.getParentId());
- di.setImageStatus(diskImage.getImageStatus());
+ di.setStatus(diskImage.getStatus());
di.setLastModified(new Date(diskImage.getLastModified().getTime()));
di.storageIds = new ArrayList<Guid>(diskImage.storageIds);
di.setVmSnapshotId(diskImage.getVmSnapshotId());
@@ -476,7 +478,7 @@
di.setCreationDate(new Date());
di.setLastModified(new Date());
di.setActive(true);
- di.setImageStatus(ImageStatus.LOCKED);
+ di.setStatus(ImageStatus.LOCKED);
return di;
}
diff --git
a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/DiskImageDAODbFacadeImpl.java
b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/DiskImageDAODbFacadeImpl.java
index 107a027..2068740 100644
---
a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/DiskImageDAODbFacadeImpl.java
+++
b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/DiskImageDAODbFacadeImpl.java
@@ -165,7 +165,7 @@
entity.setImageTemplateId(getGuidDefaultEmpty(rs, "it_guid"));
entity.setSize(rs.getLong("size"));
entity.setParentId(getGuidDefaultEmpty(rs, "ParentId"));
- entity.setImageStatus(ImageStatus.forValue(rs
+ entity.setStatus(ImageStatus.forValue(rs
.getInt("imageStatus")));
entity.setLastModified(DbFacadeUtils.fromDate(rs
.getTimestamp("lastModified")));
diff --git
a/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/ImageDaoTest.java
b/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/ImageDaoTest.java
index 61a8d34..206e061 100644
---
a/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/ImageDaoTest.java
+++
b/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/ImageDaoTest.java
@@ -93,13 +93,13 @@
List<DiskImage> snapshots =
dbFacade.getDiskImageDao().getAllSnapshotsForImageGroup(image.getDiskId());
assertFalse(snapshots.size() == 1);
for (DiskImage diskImage : snapshots) {
- assertFalse(ImageStatus.LOCKED == diskImage.getImageStatus());
+ assertFalse(ImageStatus.LOCKED == diskImage.getStatus());
}
dao.updateStatusOfImagesByImageGroupId(image.getDiskId(),
ImageStatus.LOCKED);
snapshots =
dbFacade.getDiskImageDao().getAllSnapshotsForImageGroup(image.getDiskId());
for (DiskImage diskImage : snapshots) {
- assertEquals(ImageStatus.LOCKED, diskImage.getImageStatus());
+ assertEquals(ImageStatus.LOCKED, diskImage.getStatus());
}
}
}
diff --git
a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/AbstractBackendDisksResourceTest.java
b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/AbstractBackendDisksResourceTest.java
index 2892aee..4a4d99f 100644
---
a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/AbstractBackendDisksResourceTest.java
+++
b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/AbstractBackendDisksResourceTest.java
@@ -99,7 +99,7 @@
expect(entity.getVmSnapshotId()).andReturn(GUIDS[2]).anyTimes();
expect(entity.getVolumeFormat()).andReturn(VolumeFormat.RAW).anyTimes();
expect(entity.getDiskInterface()).andReturn(DiskInterface.VirtIO).anyTimes();
- expect(entity.getImageStatus()).andReturn(ImageStatus.OK).anyTimes();
+ expect(entity.getStatus()).andReturn(ImageStatus.OK).anyTimes();
expect(entity.getVolumeType()).andReturn(VolumeType.Sparse).anyTimes();
expect(entity.isBoot()).andReturn(false).anyTimes();
expect(entity.isShareable()).andReturn(false).anyTimes();
diff --git
a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendDiskResourceTest.java
b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendDiskResourceTest.java
index a1eda11..05d876a 100644
---
a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendDiskResourceTest.java
+++
b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendDiskResourceTest.java
@@ -130,7 +130,7 @@
entity.setImageId(GUIDS[1]);
entity.setvolumeFormat(VolumeFormat.RAW);
entity.setDiskInterface(DiskInterface.VirtIO);
- entity.setImageStatus(ImageStatus.OK);
+ entity.setStatus(ImageStatus.OK);
entity.setVolumeType(VolumeType.Sparse);
entity.setBoot(false);
entity.setShareable(false);
diff --git
a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendDisksResourceTest.java
b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendDisksResourceTest.java
index fe4a4d7..f37f98c 100644
---
a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendDisksResourceTest.java
+++
b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendDisksResourceTest.java
@@ -42,7 +42,7 @@
entity.setId(GUIDS[index]);
entity.setvolumeFormat(VolumeFormat.RAW);
entity.setDiskInterface(DiskInterface.VirtIO);
- entity.setImageStatus(ImageStatus.OK);
+ entity.setStatus(ImageStatus.OK);
entity.setVolumeType(VolumeType.Sparse);
entity.setBoot(false);
entity.setShareable(false);
diff --git
a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendExportDomainDisksResourceTest.java
b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendExportDomainDisksResourceTest.java
index 136d52c..99166b7 100644
---
a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendExportDomainDisksResourceTest.java
+++
b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendExportDomainDisksResourceTest.java
@@ -86,7 +86,7 @@
entity.setId(GUIDS[index]);
entity.setvolumeFormat(VolumeFormat.RAW);
entity.setDiskInterface(DiskInterface.VirtIO);
- entity.setImageStatus(ImageStatus.OK);
+ entity.setStatus(ImageStatus.OK);
entity.setVolumeType(VolumeType.Sparse);
entity.setBoot(false);
entity.setShareable(false);
diff --git
a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendStorageDomainDiskResourceTest.java
b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendStorageDomainDiskResourceTest.java
index 822ee5e..52870c3 100644
---
a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendStorageDomainDiskResourceTest.java
+++
b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendStorageDomainDiskResourceTest.java
@@ -119,7 +119,7 @@
entity.setId(GUIDS[index]);
entity.setvolumeFormat(VolumeFormat.RAW);
entity.setDiskInterface(DiskInterface.VirtIO);
- entity.setImageStatus(ImageStatus.OK);
+ entity.setStatus(ImageStatus.OK);
entity.setVolumeType(VolumeType.Sparse);
entity.setBoot(false);
entity.setShareable(false);
diff --git
a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendStorageDomainDisksResourceTest.java
b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendStorageDomainDisksResourceTest.java
index cb5f6a3..ae60ba1 100644
---
a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendStorageDomainDisksResourceTest.java
+++
b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendStorageDomainDisksResourceTest.java
@@ -51,7 +51,7 @@
entity.setId(GUIDS[index]);
entity.setvolumeFormat(VolumeFormat.RAW);
entity.setDiskInterface(DiskInterface.VirtIO);
- entity.setImageStatus(ImageStatus.OK);
+ entity.setStatus(ImageStatus.OK);
entity.setVolumeType(VolumeType.Sparse);
entity.setBoot(false);
entity.setShareable(false);
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 ad359fd..407a667 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
@@ -123,7 +123,7 @@
}
}
if (disk.isSetStatus()) {
-
diskImage.setImageStatus(map(DiskStatus.fromValue(disk.getStatus().getState())));
+
diskImage.setStatus(map(DiskStatus.fromValue(disk.getStatus().getState())));
}
if (disk.isSetSnapshot() && disk.getSnapshot().isSetId()) {
diskImage.setVmSnapshotId(GuidUtils.asGuid(disk.getSnapshot().getId()));
@@ -192,8 +192,8 @@
if (entity.getVolumeFormat() != null) {
model.setFormat(map(entity.getVolumeFormat(), null));
}
- if (entity.getImageStatus() != null) {
- DiskStatus status = map(entity.getImageStatus());
+ if (entity.getStatus() != null) {
+ DiskStatus status = map(entity.getStatus());
model.setStatus(StatusUtils.create(status == null ? null :
status.value()));
}
model.setSparse(VolumeType.Sparse == entity.getVolumeType());
diff --git
a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfReader.java
b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfReader.java
index a9ca512..716eeb4 100644
---
a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfReader.java
+++
b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfReader.java
@@ -830,7 +830,7 @@
image.setId(OvfParser.GetImageGrupIdFromImageFile(node.attributes.get("ovf:href").getValue()));
// Default values:
image.setActive(true);
- image.setImageStatus(ImageStatus.OK);
+ image.setStatus(ImageStatus.OK);
image.setDescription(node.attributes.get("ovf:description").getValue());
_images.add(image);
}
diff --git
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/GetImageInfoVDSCommand.java
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/GetImageInfoVDSCommand.java
index 669c066..4afe0fc 100644
---
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/GetImageInfoVDSCommand.java
+++
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/GetImageInfoVDSCommand.java
@@ -84,7 +84,7 @@
newImage.setParentId(new Guid((String)
xmlRpcStruct.get(IrsProperties.parent)));
newImage.setDescription((String)
xmlRpcStruct.get(IrsProperties.description));
- newImage.setImageStatus(EnumUtils.valueOf(ImageStatus.class,
+ newImage.setStatus(EnumUtils.valueOf(ImageStatus.class,
(String) xmlRpcStruct.get(IrsProperties.ImageStatus),
true));
if (xmlRpcStruct.containsKey(IrsProperties.size)) {
newImage.setSize(Long.parseLong(xmlRpcStruct.get(IrsProperties.size).toString())
* 512);
diff --git
a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/column/DiskImageStatusColumn.java
b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/column/DiskImageStatusColumn.java
index 7ab6a25..0b21924 100644
---
a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/column/DiskImageStatusColumn.java
+++
b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/column/DiskImageStatusColumn.java
@@ -8,9 +8,9 @@
@Override
public ImageResource getValue(DiskImage diskImage) {
- setEnumTitle(diskImage.getImageStatus());
+ setEnumTitle(diskImage.getStatus());
- switch (diskImage.getImageStatus()) {
+ switch (diskImage.getStatus()) {
case OK:
return getCommonResources().upImage();
case LOCKED:
diff --git
a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/column/DiskStatusColumn.java
b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/column/DiskStatusColumn.java
index be3897b..71eceaa 100644
---
a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/column/DiskStatusColumn.java
+++
b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/column/DiskStatusColumn.java
@@ -13,8 +13,8 @@
if (disk.getDiskStorageType().equals(DiskStorageType.IMAGE)) {
DiskImage diskImage = (DiskImage) disk;
- if (diskImage.getImageStatus().equals(ImageStatus.LOCKED)) {
- setEnumTitle(diskImage.getImageStatus());
+ if (diskImage.getStatus().equals(ImageStatus.LOCKED)) {
+ setEnumTitle(diskImage.getStatus());
return new DiskImageStatusColumn().getValue(diskImage);
}
}
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 5cef61f..960b166 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
@@ -263,7 +263,7 @@
@Override
protected ImageStatus getRawValue(Disk object) {
return object.getDiskStorageType() == DiskStorageType.IMAGE ?
- ((DiskImage) object).getImageStatus() : null;
+ ((DiskImage) object).getStatus() : null;
}
};
diff --git
a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/AbstractVmPopupWidget.java
b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/AbstractVmPopupWidget.java
index 6f34ef7..e23833d 100644
---
a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/AbstractVmPopupWidget.java
+++
b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/AbstractVmPopupWidget.java
@@ -1775,7 +1775,7 @@
for (DiskModel diskModel : disks) {
Disk disk = diskModel.getDisk();
if (disk.getDiskStorageType() == DiskStorageType.IMAGE &&
- ((DiskImage) disk).getImageStatus() == status) {
+ ((DiskImage) disk).getStatus() == status) {
disksAliases.add(disk.getDiskAlias());
}
diff --git
a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/vm/VmSnapshotCustomPreviewPopupWidget.java
b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/vm/VmSnapshotCustomPreviewPopupWidget.java
index 6a1a7ca..41e74dd 100644
---
a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/vm/VmSnapshotCustomPreviewPopupWidget.java
+++
b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/vm/VmSnapshotCustomPreviewPopupWidget.java
@@ -240,7 +240,7 @@
if (image == null) {
sb.appendEscaped(constants.notAvailableLabel());
}
- else if (image.getImageStatus() == ImageStatus.ILLEGAL) {
+ else if (image.getStatus() == ImageStatus.ILLEGAL) {
sb.append(templates.textAndTitle(constants.notAvailableLabel(),
constants.illegalStatus()));
}
else {
diff --git
a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/template/TemplateDiskListModelTable.java
b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/template/TemplateDiskListModelTable.java
index 5da442a..da62250 100644
---
a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/template/TemplateDiskListModelTable.java
+++
b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/template/TemplateDiskListModelTable.java
@@ -59,7 +59,7 @@
TextColumnWithTooltip<DiskImage> statusColumn = new
EnumColumn<DiskImage, ImageStatus>() {
@Override
protected ImageStatus getRawValue(DiskImage object) {
- return object.getImageStatus();
+ return object.getStatus();
}
};
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 1e6c8c8..bb3a7b9 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
@@ -143,7 +143,7 @@
TextColumnWithTooltip<DiskImage> statusColumn = new
EnumColumn<DiskImage, ImageStatus>() {
@Override
protected ImageStatus getRawValue(DiskImage object) {
- return object.getImageStatus();
+ return object.getStatus();
}
};
disksTable.addColumn(statusColumn, constants.statusDisk(), "65px");
//$NON-NLS-1$
diff --git
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/disks/DiskListModel.java
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/disks/DiskListModel.java
index 7bcf4a4..fcafa04 100644
---
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/disks/DiskListModel.java
+++
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/disks/DiskListModel.java
@@ -516,7 +516,7 @@
boolean shouldAllowEdit = true;
if (disk != null) {
shouldAllowEdit = !disk.isOvfStore() &&
!(disk.getDiskStorageType() == DiskStorageType.IMAGE &&
- ((DiskImage) disk).getImageStatus() == ImageStatus.LOCKED);
+ ((DiskImage) disk).getStatus() == ImageStatus.LOCKED);
}
getNewCommand().setIsExecutionAllowed(true);
@@ -551,7 +551,7 @@
}
DiskImage diskImage = (DiskImage) disk;
- if (diskImage.getImageStatus() != ImageStatus.OK ||
!datacenterId.equals(diskImage.getStoragePoolId()) || diskImage.isOvfStore()) {
+ if (diskImage.getStatus() != ImageStatus.OK ||
!datacenterId.equals(diskImage.getStoragePoolId()) || diskImage.isOvfStore()) {
disableMoveAndCopyCommands();
return;
}
@@ -585,7 +585,7 @@
}
if (disk.getDiskStorageType() == DiskStorageType.IMAGE) {
- ImageStatus imageStatus = ((DiskImage) disk).getImageStatus();
+ ImageStatus imageStatus = ((DiskImage) disk).getStatus();
if (imageStatus == ImageStatus.LOCKED) {
return false;
}
@@ -608,7 +608,7 @@
for (Disk disk : disks)
{
if (disk.getDiskStorageType() == DiskStorageType.IMAGE &&
- ((DiskImage) disk).getImageStatus() != ImageStatus.OK) {
+ ((DiskImage) disk).getStatus() != ImageStatus.OK) {
return false;
}
}
@@ -631,7 +631,7 @@
DiskImage diskImage = (DiskImage) disk;
- if (diskImage.getImageStatus() != ImageStatus.OK ||
!diskImage.getParentId().equals(Guid.Empty)) {
+ if (diskImage.getStatus() != ImageStatus.OK ||
!diskImage.getParentId().equals(Guid.Empty)) {
return false;
}
}
diff --git
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/StorageDiskListModel.java
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/StorageDiskListModel.java
index aa9a991..aef89a6 100644
---
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/StorageDiskListModel.java
+++
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/StorageDiskListModel.java
@@ -120,7 +120,7 @@
private boolean isRemoveCommandAvailable(ArrayList<DiskImage> disks) {
for (DiskImage disk : disks) {
- boolean isImageLocked = disk.getImageStatus() ==
ImageStatus.LOCKED;
+ boolean isImageLocked = disk.getStatus() == ImageStatus.LOCKED;
if (isImageLocked) {
return false;
diff --git
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/StorageSnapshotListModel.java
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/StorageSnapshotListModel.java
index 7a664ac..92a1f40 100644
---
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/StorageSnapshotListModel.java
+++
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/StorageSnapshotListModel.java
@@ -128,7 +128,7 @@
private boolean isRemoveCommandAvailable(ArrayList<DiskImage> disks) {
for (DiskImage disk : disks) {
- boolean isImageLocked = disk.getImageStatus() ==
ImageStatus.LOCKED;
+ boolean isImageLocked = disk.getStatus() == ImageStatus.LOCKED;
boolean isTemplateType = disk.getVmEntityType().isTemplateType();
if (isImageLocked || isTemplateType) {
diff --git
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/TemplateDiskListModel.java
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/TemplateDiskListModel.java
index 02677d5..677f28d 100644
---
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/TemplateDiskListModel.java
+++
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/TemplateDiskListModel.java
@@ -211,7 +211,7 @@
for (DiskImage disk : disks)
{
- if (disk.getImageStatus() != ImageStatus.OK)
+ if (disk.getStatus() != ImageStatus.OK)
{
return false;
}
diff --git
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/TemplateStorageListModel.java
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/TemplateStorageListModel.java
index 18a5fbc..c55d194 100644
---
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/TemplateStorageListModel.java
+++
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/TemplateStorageListModel.java
@@ -245,7 +245,7 @@
for (DiskModel disk : disks)
{
- if (((DiskImage) disk.getDisk()).getImageStatus() ==
ImageStatus.LOCKED
+ if (((DiskImage) disk.getDisk()).getStatus() == ImageStatus.LOCKED
|| ((DiskImage) disk.getDisk()).getStorageIds().size() ==
1)
{
return false;
diff --git
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmDiskListModel.java
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmDiskListModel.java
index 81700c5..8e6712e 100644
---
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmDiskListModel.java
+++
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmDiskListModel.java
@@ -649,7 +649,7 @@
private boolean isDiskLocked(Disk disk) {
return disk != null && disk.getDiskStorageType() ==
DiskStorageType.IMAGE &&
- ((DiskImage) disk).getImageStatus() == ImageStatus.LOCKED;
+ ((DiskImage) disk).getStatus() == ImageStatus.LOCKED;
}
private boolean isSingleDiskSelected() {
@@ -680,7 +680,7 @@
{
boolean isLocked =
disk.getDiskStorageType() == DiskStorageType.IMAGE
- && ((DiskImage) disk).getImageStatus() ==
ImageStatus.LOCKED;
+ && ((DiskImage) disk).getStatus() ==
ImageStatus.LOCKED;
boolean isDiskHotpluggableInterface = false;
if (getEntity() != null) {
@@ -700,7 +700,7 @@
private boolean isImageDiskOK(Disk disk) {
return disk.getDiskStorageType() == DiskStorageType.IMAGE &&
- ((DiskImage) disk).getImageStatus() == ImageStatus.OK;
+ ((DiskImage) disk).getStatus() == ImageStatus.OK;
}
private boolean isMoveCommandAvailable() {
@@ -745,7 +745,7 @@
for (Disk disk : disks)
{
if (disk.getDiskStorageType() == DiskStorageType.IMAGE &&
- ((DiskImage) disk).getImageStatus() == ImageStatus.LOCKED
|| (!isVmDown() && disk.getPlugged()))
+ ((DiskImage) disk).getStatus() == ImageStatus.LOCKED ||
(!isVmDown() && disk.getPlugged()))
{
return false;
}
diff --git
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/storage/RegisterEntityInfoPanel.java
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/storage/RegisterEntityInfoPanel.java
index 1274762..79c31fc 100644
---
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/storage/RegisterEntityInfoPanel.java
+++
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/storage/RegisterEntityInfoPanel.java
@@ -113,7 +113,7 @@
TextColumnWithTooltip<DiskImage> statusColumn = new
EnumColumn<DiskImage, ImageStatus>() {
@Override
protected ImageStatus getRawValue(DiskImage object) {
- return object.getImageStatus();
+ return object.getStatus();
}
};
disksTable.addColumn(statusColumn, constants.statusDisk(), "65px");
//$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 6981d36..bfd96b1 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
@@ -52,7 +52,7 @@
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>(SizeConverter.SizeUnit.BYTES), disk.getActualSizeInBytes(),
"120px"); //$NON-NLS-1$
- addValueLabelToPanel(panel, new EnumLabel<ImageStatus>(),
disk.getImageStatus(), "120px"); //$NON-NLS-1$
+ addValueLabelToPanel(panel, new EnumLabel<ImageStatus>(),
disk.getStatus(), "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 DateLabel(), disk.getCreationDate(),
"90px"); //$NON-NLS-1$
diff --git
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/template/StoragesTree.java
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/template/StoragesTree.java
index 26abfd8..8eb183b 100644
---
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/template/StoragesTree.java
+++
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/template/StoragesTree.java
@@ -73,7 +73,7 @@
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 EnumLabel<ImageStatus>(),
disk.getImageStatus(), "120px"); //$NON-NLS-1$
+ addValueLabelToPanel(panel, new EnumLabel<ImageStatus>(),
disk.getStatus(), "120px"); //$NON-NLS-1$
addValueLabelToPanel(panel, new EnumLabel<VolumeType>(),
disk.getVolumeType(), "120px"); //$NON-NLS-1$
addValueLabelToPanel(panel, new EnumLabel<DiskInterface>(),
disk.getDiskInterface(), "110px"); //$NON-NLS-1$
addValueLabelToPanel(panel, new DateLabel(), disk.getCreationDate(),
"90px"); //$NON-NLS-1$
--
To view, visit http://gerrit.ovirt.org/35412
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie107839c34b3e5950fd6fe9c8f31da8836775b55
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Yair Zaslavsky <yzasl...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
