Sharad Mishra has uploaded a new change for review.
Change subject: core: Replaced getDiskImageDao with getDiskImageDAO
......................................................................
core: Replaced getDiskImageDao with getDiskImageDAO
This should help fix Jenkins warning -
"VERY confusing to have methods
org.ovirt.engine.core.bll.AbstractDiskVmCommand.getDiskDao()
and org.ovirt.engine.core.bll.VmCommand.getDiskDAO()"
Change-Id: Ib82d0c80652c8c4a10019ce515051eb1e60dfa92
Signed-off-by: Sharad Mishra <snmis...@linux.vnet.ibm.com>
---
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AbstractDiskVmCommand.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/AddVmFromSnapshotCommand.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/CreateImageTemplateCommand.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CreateSnapshotCommand.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/DetachDiskFromVmCommand.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetVmConfigurationBySnapshotQuery.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/MoveOrCopyImageGroupCommand.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/RemoveSnapshotSingleDiskCommand.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RestoreFromSnapshotCommand.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/TryBackToSnapshotCommand.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmDiskCommand.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/UpdateVmDiskCommandTest.java
17 files changed, 25 insertions(+), 51 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/46/7846/1
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AbstractDiskVmCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AbstractDiskVmCommand.java
index 36a0a4c..e756aa0 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AbstractDiskVmCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AbstractDiskVmCommand.java
@@ -28,7 +28,6 @@
import org.ovirt.engine.core.dal.dbbroker.auditloghandling.CustomLogField;
import org.ovirt.engine.core.dal.dbbroker.auditloghandling.CustomLogFields;
import org.ovirt.engine.core.dao.DiskDao;
-import org.ovirt.engine.core.dao.DiskImageDAO;
import org.ovirt.engine.core.dao.ImageDao;
import org.ovirt.engine.core.dao.SnapshotDao;
import org.ovirt.engine.core.dao.StoragePoolIsoMapDAO;
@@ -161,10 +160,6 @@
protected DiskDao getDiskDao() {
return getDbFacade().getDiskDao();
- }
-
- protected DiskImageDAO getDiskImageDao() {
- return getDbFacade().getDiskImageDAO();
}
protected SnapshotDao getSnapshotDao() {
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 98c809a..51d780b 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
@@ -23,7 +23,6 @@
import org.ovirt.engine.core.common.errors.VdcBllErrors;
import org.ovirt.engine.core.compat.Guid;
import org.ovirt.engine.core.dal.dbbroker.DbFacade;
-import org.ovirt.engine.core.dao.DiskImageDAO;
/**
* This abstract class holds helper methods for concrete command classes that
require to add a VM and clone an image in
@@ -249,11 +248,6 @@
diskImage.setImageId(imageId);
return diskImage;
}
-
- protected DiskImageDAO getDiskImageDao() {
- return DbFacade.getInstance().getDiskImageDAO();
- }
-
@Override
protected void ExecuteVmCommand() {
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmFromSnapshotCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmFromSnapshotCommand.java
index 37d3301..2a11d7c 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmFromSnapshotCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmFromSnapshotCommand.java
@@ -64,7 +64,7 @@
public NGuid getStorageDomainId() {
if (storageDomainId == null) {
// This is needed for logging the command using
CommandBase.logCommand
- List<DiskImage> images =
getDiskImageDao().getAllSnapshotsForVmSnapshot(sourceSnapshotId);
+ List<DiskImage> images =
getDiskImageDAO().getAllSnapshotsForVmSnapshot(sourceSnapshotId);
storageDomainId = (!images.isEmpty()) ?
images.get(0).getstorage_ids().get(0) : Guid.Empty;
}
return storageDomainId;
@@ -117,7 +117,7 @@
// query returned to UI an illegal image)
if (diskImage.getimageStatus() == ImageStatus.ILLEGAL) {
DiskImage snapshotImageInDb =
-
getDiskImageDao().getSnapshotById(diskImage.getImageId());
+
getDiskImageDAO().getSnapshotById(diskImage.getImageId());
if (snapshotImageInDb == null) {
// If the snapshot diskImage is null, it means the
disk was probably
// erased after the snapshot was created.
@@ -159,11 +159,11 @@
if (volumeInfoChanged(diskImageFromClient, srcDiskImage)) {
changeVolumeInfo(clonedDiskImage, diskImageFromClient);
} else {
- DiskImage ancestorDiskImage =
getDiskImageDao().getAncestor(srcDiskImage.getImageId());
+ DiskImage ancestorDiskImage =
getDiskImageDAO().getAncestor(srcDiskImage.getImageId());
changeVolumeInfo(clonedDiskImage, ancestorDiskImage);
}
} else {
- DiskImage ancestorDiskImage =
getDiskImageDao().getAncestor(srcDiskImage.getImageId());
+ DiskImage ancestorDiskImage =
getDiskImageDAO().getAncestor(srcDiskImage.getImageId());
changeVolumeInfo(clonedDiskImage, ancestorDiskImage);
}
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 99e6fc4..0f53dfb 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
@@ -22,7 +22,6 @@
import org.ovirt.engine.core.compat.Guid;
import org.ovirt.engine.core.dal.dbbroker.DbFacade;
import org.ovirt.engine.core.dao.BaseDiskDao;
-import org.ovirt.engine.core.dao.DiskImageDAO;
import org.ovirt.engine.core.dao.ImageDao;
import org.ovirt.engine.core.dao.SnapshotDao;
@@ -57,11 +56,11 @@
protected DiskImage getImage() {
if (mImage == null) {
- DiskImage image = getDiskImageDao().get(getImageId());
+ DiskImage image = getDiskImageDAO().get(getImageId());
if (image != null) {
mImage = image;
} else {
- image = getDiskImageDao().getSnapshotById(getImageId());
+ image = getDiskImageDAO().getSnapshotById(getImageId());
if (image != null) {
mImage = image;
}
@@ -72,10 +71,6 @@
protected ImageDao getImageDao() {
return getDbFacade().getImageDao();
- }
-
- protected DiskImageDAO getDiskImageDao() {
- return getDbFacade().getDiskImageDAO();
}
protected SnapshotDao getSnapshotDao() {
@@ -127,9 +122,9 @@
protected DiskImage getDestinationDiskImage() {
if (_destinationImage == null) {
- _destinationImage = getDiskImageDao().get(getDestinationImageId());
+ _destinationImage = getDiskImageDAO().get(getDestinationImageId());
if (_destinationImage == null) {
- _destinationImage =
getDiskImageDao().getSnapshotById(getDestinationImageId());
+ _destinationImage =
getDiskImageDAO().getSnapshotById(getDestinationImageId());
}
}
return _destinationImage;
@@ -410,7 +405,7 @@
getImageStorageDomainMapDao().remove(snapshot.getImageId());
getImageDao().remove(snapshot.getImageId());
List<DiskImage> imagesForDisk =
-
getDiskImageDao().getAllSnapshotsForImageGroup(snapshot.getId());
+
getDiskImageDAO().getAllSnapshotsForImageGroup(snapshot.getId());
if (imagesForDisk == null || imagesForDisk.isEmpty()) {
getBaseDiskDao().remove(snapshot.getId());
}
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 e6db60f..9c47fd1 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
@@ -100,7 +100,7 @@
* The disk to fill the volume details in.
*/
private void fillVolumeInformation(DiskImage disk) {
- DiskImage ancestor =
getDiskImageDao().getAncestor(getDiskImage().getImageId());
+ DiskImage ancestor =
getDiskImageDAO().getAncestor(getDiskImage().getImageId());
if (ancestor == null) {
log.warnFormat("Can't find ancestor of Disk with ID {0}, using
original disk for volume info.",
getDiskImage().getImageId());
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CreateSnapshotCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CreateSnapshotCommand.java
index c11839b..1191f1f 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CreateSnapshotCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CreateSnapshotCommand.java
@@ -165,7 +165,7 @@
// Empty Guid, means new disk rather than snapshot, so no need to
add a map to the db for new disk.
if (!getDestinationDiskImage().getParentId().equals(Guid.Empty)) {
if
(!getDestinationDiskImage().getParentId().equals(getDestinationDiskImage().getit_guid()))
{
- DiskImage previousSnapshot =
getDiskImageDao().getSnapshotById(
+ DiskImage previousSnapshot =
getDiskImageDAO().getSnapshotById(
getDestinationDiskImage().getParentId());
previousSnapshot.setactive(true);
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/DetachDiskFromVmCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/DetachDiskFromVmCommand.java
index 7a527c8..fbaa2e6 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/DetachDiskFromVmCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/DetachDiskFromVmCommand.java
@@ -55,7 +55,7 @@
// Check if disk has no snapshots before detaching it.
if (retValue && DiskStorageType.IMAGE == disk.getDiskStorageType()
- &&
getDiskImageDao().getAllSnapshotsForImageGroup(disk.getId()).size() > 1) {
+ &&
getDiskImageDAO().getAllSnapshotsForImageGroup(disk.getId()).size() > 1) {
addCanDoActionMessage(VdcBllMessages.ERROR_CANNOT_DETACH_DISK_WITH_SNAPSHOT);
retValue = false;
}
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetVmConfigurationBySnapshotQuery.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetVmConfigurationBySnapshotQuery.java
index b91a19d..ea670f2 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetVmConfigurationBySnapshotQuery.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetVmConfigurationBySnapshotQuery.java
@@ -11,7 +11,6 @@
import org.ovirt.engine.core.common.businessentities.VM;
import
org.ovirt.engine.core.common.queries.GetVmConfigurationBySnapshotQueryParams;
import org.ovirt.engine.core.compat.Guid;
-import org.ovirt.engine.core.dao.DiskImageDAO;
import org.ovirt.engine.core.dao.SnapshotDao;
import org.ovirt.engine.core.dao.VmDAO;
@@ -59,7 +58,7 @@
*/
protected void markImagesIllegalIfNotInDb(VM vm) {
List<DiskImage> imagesInDb =
-
getDiskImageDao().getAllSnapshotsForVmSnapshot(getParameters().getSnapshotId());
+
getDbFacade().getDiskImageDAO().getAllSnapshotsForVmSnapshot(getParameters().getSnapshotId());
// Converts to a map of Id to DiskImage in order to check existence
only by Image ID (in case not all
// image data is written to OVF
Map<Guid, DiskImage> imagesInDbMap =
ImagesHandler.getDiskImagesByIdMap(imagesInDb);
@@ -72,10 +71,6 @@
fromConfigImg.setimageStatus(ImageStatus.ILLEGAL);
}
}
- }
-
- protected DiskImageDAO getDiskImageDao() {
- return getDbFacade().getDiskImageDAO();
}
protected VmDAO getVmDao() {
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 1014c85..5def5af 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
@@ -248,7 +248,7 @@
boolean retValue = true;
if (getParameters().getOperation() == ImageOperation.Move
&&
!ImagesHandler.BlankImageTemplateId.equals(getImage().getit_guid())) {
- DiskImage templateImage =
getDiskImageDao().get(getImage().getit_guid());
+ DiskImage templateImage =
getDiskImageDAO().get(getImage().getit_guid());
if
(!templateImage.getstorage_ids().contains(getParameters().getStorageDomainId()))
{
retValue = false;
addCanDoActionMessage(VdcBllMessages.ACTION_TYPE_FAILED_TEMPLATE_NOT_FOUND_ON_DESTINATION_DOMAIN);
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MoveOrCopyImageGroupCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MoveOrCopyImageGroupCommand.java
index 48eaba4..bf158c7 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MoveOrCopyImageGroupCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MoveOrCopyImageGroupCommand.java
@@ -118,7 +118,7 @@
if (getParameters().getOperation() == ImageOperation.Move
|| getParameters().getParentCommand() ==
VdcActionType.ImportVm
|| getParameters().getParentCommand() ==
VdcActionType.ImportVmTemplate) {
- List<DiskImage> snapshots = getDiskImageDao()
+ List<DiskImage> snapshots = getDiskImageDAO()
.getAllSnapshotsForImageGroup(getParameters().getDestImageGroupId());
setSnapshotForShareableDisk(snapshots);
for (DiskImage snapshot : snapshots) {
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 e5aa737..2c44a01 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
@@ -131,7 +131,7 @@
while (!currentGuid.equals(imageTemplate) &&
!currentGuid.equals(Guid.Empty)) {
RemoveChildren(currentGuid);
- DiskImage image =
getDiskImageDao().getSnapshotById(currentGuid);
+ DiskImage image =
getDiskImageDAO().getSnapshotById(currentGuid);
if (image != null) {
RemoveSnapshot(image);
currentGuid = image.getParentId();
@@ -199,7 +199,7 @@
GetImageChildren(snapshot, children);
Collections.reverse(children);
for (Guid child : children) {
- RemoveSnapshot(getDiskImageDao().getSnapshotById(child));
+ RemoveSnapshot(getDiskImageDAO().getSnapshotById(child));
}
}
@@ -208,7 +208,7 @@
*/
private List<Snapshot> prepareSnapshotConfigWithoutImage(Guid
imageGroupToRemove) {
List<Snapshot> result = new LinkedList<Snapshot>();
- List<DiskImage> snapshotDisks =
getDiskImageDao().getAllSnapshotsForImageGroup(imageGroupToRemove);
+ List<DiskImage> snapshotDisks =
getDiskImageDAO().getAllSnapshotsForImageGroup(imageGroupToRemove);
for (DiskImage snapshotDisk : snapshotDisks) {
NGuid vmSnapshotId = snapshotDisk.getvm_snapshot_id();
if (vmSnapshotId != null &&
!Guid.Empty.equals(vmSnapshotId.getValue())) {
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveSnapshotSingleDiskCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveSnapshotSingleDiskCommand.java
index d27a83c..a56a4e5 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveSnapshotSingleDiskCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveSnapshotSingleDiskCommand.java
@@ -72,7 +72,7 @@
if (getDestinationDiskImage() != null) {
DiskImage curr = getDestinationDiskImage();
while (!curr.getParentId().equals(getDiskImage().getParentId())) {
- curr = getDiskImageDao().getSnapshotById(curr.getParentId());
+ curr = getDiskImageDAO().getSnapshotById(curr.getParentId());
getImageDao().remove(curr.getImageId());
}
getDestinationDiskImage().setvolume_format(curr.getvolume_format());
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RestoreFromSnapshotCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RestoreFromSnapshotCommand.java
index e34df8c..ab43885 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RestoreFromSnapshotCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RestoreFromSnapshotCommand.java
@@ -57,7 +57,7 @@
case PREVIEW:
case STATELESS:
if (imageToRemoveId != null) {
- RemoveSnapshot(getDiskImageDao().get(imageToRemoveId));
+ RemoveSnapshot(getDiskImageDAO().get(imageToRemoveId));
}
break;
@@ -84,7 +84,7 @@
}
private void RemoveOtherImageAndParents(Guid imageId, Guid lastParent) {
- DiskImage image = getDiskImageDao().getSnapshotById(imageId);
+ DiskImage image = getDiskImageDAO().getSnapshotById(imageId);
// store other mapped image's parent Id
Guid currentParent = image.getParentId();
// Remove other mapped image from Irs and db
@@ -93,7 +93,7 @@
*/
RemoveSnapshot(image);
while (!lastParent.equals(currentParent)) {
- image = getDiskImageDao().getSnapshotById(currentParent);
+ image = getDiskImageDAO().getSnapshotById(currentParent);
// store current image's parent Id
currentParent = image.getParentId();
/**
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/TryBackToSnapshotCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/TryBackToSnapshotCommand.java
index 1ae005a..db73ec6 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/TryBackToSnapshotCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/TryBackToSnapshotCommand.java
@@ -46,7 +46,7 @@
return;
}
- DiskImage oldImage = getDiskImageDao().getSnapshotById(oldImageId);
+ DiskImage oldImage = getDiskImageDAO().getSnapshotById(oldImageId);
oldImage.setactive(active);
getImageDao().update(oldImage.getImage());
}
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 cbe8381..5ab1d6d 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
@@ -170,7 +170,7 @@
// If user want to update the disk to be shareable then update the vm
snapshot id to be null.
if (!isDiskShareable && isDiskUpdatedToShareable) {
List<DiskImage> diskImageList =
-
getDiskImageDao().getAllSnapshotsForImageGroup(_oldDisk.getId());
+
getDiskImageDAO().getAllSnapshotsForImageGroup(_oldDisk.getId());
// If disk image list is more then one then we assume that it has
a snapshot, since one image is the active
// disk and all the other images are the snapshots.
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 43e5128..ec469dd 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
@@ -212,11 +212,6 @@
}
@Override
- protected DiskImageDAO getDiskImageDao() {
- return diskImageDao;
- }
-
- @Override
protected boolean acquireLockInternal() {
return true;
}
diff --git
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/UpdateVmDiskCommandTest.java
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/UpdateVmDiskCommandTest.java
index d04ecb2..47adf74 100644
---
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/UpdateVmDiskCommandTest.java
+++
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/UpdateVmDiskCommandTest.java
@@ -127,7 +127,7 @@
doReturn(true).when(command).acquireLockInternal();
doReturn(vmNetworkInterfaceDAO).when(command).getVmNetworkInterfaceDAO();
doReturn(snapshotDao).when(command).getSnapshotDao();
- doReturn(diskImageDao).when(command).getDiskImageDao();
+ doReturn(diskImageDao).when(command).getDiskImageDAO();
doReturn(storagePoolDao).when(command).getStoragePoolDAO();
mockVds();
}
--
To view, visit http://gerrit.ovirt.org/7846
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib82d0c80652c8c4a10019ce515051eb1e60dfa92
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Sharad Mishra <snmis...@linux.vnet.ibm.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
