Roy Golan has uploaded a new change for review. Change subject: core: CDI WIP - move commands to use DAO getter ......................................................................
core: CDI WIP - move commands to use DAO getter Change-Id: Icba2ba98a7581c74dcecf67a75f55f2d7d8a1ffc Signed-off-by: Roy Golan <[email protected]> --- 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/ActivateDeactivateVmNicCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddDiskCommand.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/ChangeQuotaForDiskCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CreateAllSnapshotsFromVmCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/DetachNetworkFromVdsInterfaceCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/InitVdsOnUpCommand.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/QuotaCRUDCommand.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/RemoveImageCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveSnapshotCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveVdsCommand.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/RunVmCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/TryBackToAllSnapshotsOfVmCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVdsGroupCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/quota/ChangeQuotaCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/AddStorageServerConnectionCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/ConnectAllHostsToLunCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/DeactivateStorageDomainCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/RemoveStorageDomainCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/StorageDomainCommandBase.java M backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/auditloghandling/AuditLogableBase.java 29 files changed, 132 insertions(+), 103 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/11/9811/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 d66f29d..2769bb3 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 @@ -27,9 +27,6 @@ import org.ovirt.engine.core.dal.VdcBllMessages; 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.ImageDao; -import org.ovirt.engine.core.dao.SnapshotDao; import org.ovirt.engine.core.dao.StoragePoolIsoMapDAO; @CustomLogFields({ @CustomLogField("DiskAlias") }) @@ -154,24 +151,11 @@ return false; } - protected ImageDao getImageDao() { - return getDbFacade().getImageDao(); - } - - protected DiskDao getDiskDao() { - return getDbFacade().getDiskDao(); - } - - protected SnapshotDao getSnapshotDao() { - return getDbFacade().getSnapshotDao(); - } - - /** * @return The StoragePoolIsoMapDAO */ protected StoragePoolIsoMapDAO getStoragePoolIsoMapDao() { - return getDbFacade().getStoragePoolIsoMapDao(); + return getStoragePoolIsoMapDao(); } public String getDiskAlias() { diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ActivateDeactivateVmNicCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ActivateDeactivateVmNicCommand.java index bd35c1e..9038ceb 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ActivateDeactivateVmNicCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ActivateDeactivateVmNicCommand.java @@ -136,7 +136,7 @@ } protected InterfaceDAO getInterfaceDao() { - return getDbFacade().getInterfaceDao(); + return getInterfaceDao(); } private boolean hotPlugVmNicRequired(VMStatus vmStatus) { diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddDiskCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddDiskCommand.java index b311a62..2238b8b 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddDiskCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddDiskCommand.java @@ -51,7 +51,6 @@ import org.ovirt.engine.core.dal.dbbroker.DbFacade; import org.ovirt.engine.core.dao.BaseDiskDao; import org.ovirt.engine.core.dao.DiskLunMapDao; -import org.ovirt.engine.core.dao.SnapshotDao; import org.ovirt.engine.core.dao.StorageDomainStaticDAO; import org.ovirt.engine.core.utils.transaction.TransactionMethod; import org.ovirt.engine.core.utils.transaction.TransactionSupport; @@ -257,11 +256,6 @@ */ protected StorageDomainStaticDAO getStorageDomainStaticDao() { return DbFacade.getInstance().getStorageDomainStaticDao(); - } - - @Override - protected SnapshotDao getSnapshotDao() { - return DbFacade.getInstance().getSnapshotDao(); } protected BaseDiskDao getBaseDiskDao() { 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 6437140..7389147 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 @@ -26,7 +26,6 @@ import org.ovirt.engine.core.compat.Guid; import org.ovirt.engine.core.compat.NGuid; import org.ovirt.engine.core.dal.VdcBllMessages; -import org.ovirt.engine.core.dao.SnapshotDao; import org.ovirt.engine.core.utils.transaction.TransactionMethod; import org.ovirt.engine.core.utils.transaction.TransactionSupport; @@ -317,10 +316,6 @@ } } return result; - } - - protected SnapshotDao getSnapshotDao() { - return getDbFacade().getSnapshotDao(); } private void lockEntities() { 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 4e25ab4..f91c712 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 @@ -23,7 +23,6 @@ import org.ovirt.engine.core.dal.dbbroker.DbFacade; import org.ovirt.engine.core.dao.BaseDiskDao; import org.ovirt.engine.core.dao.ImageDao; -import org.ovirt.engine.core.dao.SnapshotDao; /** * Base class for all image handling commands @@ -70,11 +69,7 @@ } protected ImageDao getImageDao() { - return getDbFacade().getImageDao(); - } - - protected SnapshotDao getSnapshotDao() { - return getDbFacade().getSnapshotDao(); + return getImageDao(); } protected void setImage(DiskImage image) { @@ -325,7 +320,7 @@ } protected BaseDiskDao getBaseDiskDao() { - return getDbFacade().getBaseDiskDao(); + return getBaseDiskDao(); } protected void lockImage() { diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ChangeQuotaForDiskCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ChangeQuotaForDiskCommand.java index df98811..2a9382a 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ChangeQuotaForDiskCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ChangeQuotaForDiskCommand.java @@ -24,7 +24,7 @@ @Override protected boolean canDoAction() { - Disk disk = getDbFacade().getDiskDao().get(getParameters().getObjectId()); + Disk disk = getDiskDao().get(getParameters().getObjectId()); if (disk == null) { addCanDoActionMessage(VdcBllMessages.ACTION_TYPE_FAILED_DISK_NOT_EXIST); return false; @@ -40,7 +40,7 @@ @Override protected void executeCommand() { - getDbFacade().getImageDao().updateQuotaForImageAndSnapshots(getParameters().getObjectId(), + getImageDao().updateQuotaForImageAndSnapshots(getParameters().getObjectId(), getParameters().getQuotaId()); setSucceeded(true); } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CreateAllSnapshotsFromVmCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CreateAllSnapshotsFromVmCommand.java index 886a996..3895d2a 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CreateAllSnapshotsFromVmCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CreateAllSnapshotsFromVmCommand.java @@ -39,7 +39,6 @@ import org.ovirt.engine.core.dal.VdcBllMessages; import org.ovirt.engine.core.dal.dbbroker.DbFacade; import org.ovirt.engine.core.dal.dbbroker.auditloghandling.AuditLogDirector; -import org.ovirt.engine.core.dao.SnapshotDao; import org.ovirt.engine.core.utils.transaction.TransactionMethod; import org.ovirt.engine.core.utils.transaction.TransactionSupport; @@ -216,10 +215,6 @@ getSnapshotDao().remove(createdSnapshotId); getSnapshotDao().updateId(getSnapshotDao().getId(getVmId(), SnapshotType.ACTIVE), createdSnapshotId); setSucceeded(false); - } - - protected SnapshotDao getSnapshotDao() { - return DbFacade.getInstance().getSnapshotDao(); } @Override diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/DetachNetworkFromVdsInterfaceCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/DetachNetworkFromVdsInterfaceCommand.java index 925f419..2f871d4 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/DetachNetworkFromVdsInterfaceCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/DetachNetworkFromVdsInterfaceCommand.java @@ -79,7 +79,7 @@ @Override protected boolean canDoAction() { - List<VdsNetworkInterface> interfaces = getDbFacade().getInterfaceDao() + List<VdsNetworkInterface> interfaces = getInterfaceDAO() .getAllInterfacesForVds(getParameters().getVdsId()); VdsNetworkInterface iface = LinqUtils.firstOrNull(interfaces, new Predicate<VdsNetworkInterface>() { @Override @@ -97,7 +97,7 @@ // set the network object if we don't got in the parameters if (getParameters().getNetwork() == null || getParameters().getNetwork().getCluster() == null) { - List<Network> networks = getDbFacade().getNetworkDao() + List<Network> networks = getNetworkDAO() .getAllForCluster(getVdsGroupId()); for (Network n : networks) { if (n.getname().equals(iface.getNetworkName())) { @@ -125,7 +125,7 @@ if ((vds.getstatus() == VDSStatus.Up || vds.getstatus() == VDSStatus.Installing) && getParameters().getNetwork().getCluster() != null && getParameters().getNetwork().getCluster().getstatus() == NetworkStatus.Operational) { - List<Network> networks = getDbFacade().getNetworkDao().getAllForCluster(vds.getvds_group_id()); + List<Network> networks = getNetworkDAO().getAllForCluster(vds.getvds_group_id()); if (null != LinqUtils.firstOrNull(networks, new Predicate<Network>() { @Override public boolean eval(Network network) { diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmCommand.java index c33c446..e242e19 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmCommand.java @@ -68,7 +68,6 @@ import org.ovirt.engine.core.dal.dbbroker.DbFacade; import org.ovirt.engine.core.dal.dbbroker.auditloghandling.AuditLogDirector; import org.ovirt.engine.core.dal.dbbroker.auditloghandling.AuditLogableBase; -import org.ovirt.engine.core.dao.SnapshotDao; import org.ovirt.engine.core.dao.StorageDomainStaticDAO; import org.ovirt.engine.core.utils.MultiValueMapUtils; import org.ovirt.engine.core.utils.linq.Function; @@ -698,10 +697,6 @@ } } } - } - - protected SnapshotDao getSnapshotDao() { - return DbFacade.getInstance().getSnapshotDao(); } // the last image in each list is the leaf diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/InitVdsOnUpCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/InitVdsOnUpCommand.java index bfdb7c4..5d18a67 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/InitVdsOnUpCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/InitVdsOnUpCommand.java @@ -37,7 +37,6 @@ import org.ovirt.engine.core.dal.dbbroker.auditloghandling.AlertDirector; import org.ovirt.engine.core.dal.dbbroker.auditloghandling.AuditLogDirector; import org.ovirt.engine.core.dal.dbbroker.auditloghandling.AuditLogableBase; -import org.ovirt.engine.core.dao.InterfaceDAO; import org.ovirt.engine.core.vdsbroker.irsbroker.IrsBrokerCommand; /** @@ -278,10 +277,6 @@ } } return false; - } - - public InterfaceDAO getInterfaceDAO() { - return getDbFacade().getInterfaceDao(); } private List<VdsNetworkInterface> getVdsInterfaces(Guid vdsId) { 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 21c9730..58f2c5a 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 @@ -261,7 +261,7 @@ } protected VmDeviceDAO getVmDeviceDAO() { - return getDbFacade().getVmDeviceDao(); + return getVmDeviceDao(); } @Override diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/QuotaCRUDCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/QuotaCRUDCommand.java index 2490f14..1be8231 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/QuotaCRUDCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/QuotaCRUDCommand.java @@ -120,7 +120,7 @@ } protected QuotaDAO getQuotaDAO() { - return getDbFacade().getQuotaDao(); + return getQuotaDAO(); } public String getQuotaName() { 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 8d5a4b6..5f5a13b 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 @@ -101,11 +101,11 @@ */ private void updateDiskImagesToIllegal(DiskImage diskImage) { List<DiskImage> snapshotDisks = - getDbFacade().getDiskImageDao().getAllSnapshotsForImageGroup(diskImage.getId()); + getDiskImageDao().getAllSnapshotsForImageGroup(diskImage.getId()); for (DiskImage diskSnapshot : snapshotDisks) { diskSnapshot.setvm_snapshot_id(null); diskSnapshot.setimageStatus(ImageStatus.ILLEGAL); - getDbFacade().getImageDao().update(diskSnapshot.getImage()); + 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 0b9827f..29eceec 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 @@ -165,7 +165,7 @@ private void setVmTemplateIdParameter() { Map<Boolean, VmTemplate> templateMap = // Disk image is the only disk type that can be part of the template disks. - getDbFacade().getVmTemplateDao().getAllForImage(((DiskImage) disk).getImageId()); + getVmTemplateDAO().getAllForImage(((DiskImage) disk).getImageId()); if (!templateMap.isEmpty()) { setVmTemplateId(templateMap.values().iterator().next().getId()); 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 1e24473..c72e32c 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 @@ -301,6 +301,6 @@ } protected VmDeviceDAO getVmDeviceDAO() { - return getDbFacade().getVmDeviceDao(); + return getVmDeviceDao(); } } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveSnapshotCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveSnapshotCommand.java index 42aeadc..72fb75d 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveSnapshotCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveSnapshotCommand.java @@ -26,7 +26,6 @@ import org.ovirt.engine.core.common.locks.LockingGroup; import org.ovirt.engine.core.compat.Guid; import org.ovirt.engine.core.dal.VdcBllMessages; -import org.ovirt.engine.core.dao.SnapshotDao; import org.ovirt.engine.core.utils.transaction.TransactionMethod; import org.ovirt.engine.core.utils.transaction.TransactionSupport; @@ -260,10 +259,6 @@ @Override protected Map<String, String> getExclusiveLocks() { return Collections.singletonMap(getVmId().toString(), LockingGroup.VM.name()); - } - - protected SnapshotDao getSnapshotDao() { - return getDbFacade().getSnapshotDao(); } @Override diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveVdsCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveVdsCommand.java index cbc4de0..ecd39f1 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveVdsCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveVdsCommand.java @@ -174,7 +174,7 @@ } protected GlusterBrickDao getGlusterBrickDao() { - return getDbFacade().getGlusterBrickDao(); + return getGlusterBrickDao(); } private boolean hasVolumeOnServer() { 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 894f1a9..33157a1 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 @@ -31,7 +31,6 @@ import org.ovirt.engine.core.compat.Guid; import org.ovirt.engine.core.compat.NGuid; import org.ovirt.engine.core.dal.VdcBllMessages; -import org.ovirt.engine.core.dao.SnapshotDao; /** * Restores the given snapshot, including all the VM configuration that was stored in it.<br> @@ -253,10 +252,6 @@ snapshotToRemove = (parentImage == null) ? null : parentImage.getvm_snapshot_id(); } } - } - - protected SnapshotDao getSnapshotDao() { - return getDbFacade().getSnapshotDao(); } @Override diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RunVmCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RunVmCommand.java index 7bb60cc..32b1013 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RunVmCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RunVmCommand.java @@ -277,7 +277,7 @@ } private boolean statelessSnapshotExistsForVm() { - return getDbFacade().getSnapshotDao().exists(getVm().getId(), SnapshotType.STATELESS); + return getSnapshotDao().exists(getVm().getId(), SnapshotType.STATELESS); } /** diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/TryBackToAllSnapshotsOfVmCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/TryBackToAllSnapshotsOfVmCommand.java index 1f1a39d..4982da8 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/TryBackToAllSnapshotsOfVmCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/TryBackToAllSnapshotsOfVmCommand.java @@ -25,7 +25,6 @@ import org.ovirt.engine.core.compat.Guid; import org.ovirt.engine.core.dal.VdcBllMessages; import org.ovirt.engine.core.dal.dbbroker.DbFacade; -import org.ovirt.engine.core.dao.SnapshotDao; import org.ovirt.engine.core.utils.linq.Function; import org.ovirt.engine.core.utils.linq.LinqUtils; import org.ovirt.engine.core.utils.transaction.TransactionMethod; @@ -74,10 +73,6 @@ snapshotsManager.addActiveSnapshot(previouslyActiveSnapshotId, getVm(), getCompensationContext()); super.endWithFailure(); - } - - protected SnapshotDao getSnapshotDao() { - return DbFacade.getInstance().getSnapshotDao(); } @Override diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVdsGroupCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVdsGroupCommand.java index 6c5fddd..d9cc295 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVdsGroupCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVdsGroupCommand.java @@ -32,8 +32,6 @@ import org.ovirt.engine.core.dal.VdcBllMessages; import org.ovirt.engine.core.dal.dbbroker.auditloghandling.AuditLogDirector; import org.ovirt.engine.core.dal.dbbroker.auditloghandling.AuditLogableBase; -import org.ovirt.engine.core.dao.NetworkDAO; -import org.ovirt.engine.core.dao.VdsStaticDAO; @SuppressWarnings("serial") public class UpdateVdsGroupCommand<T extends VdsGroupOperationParameters> extends @@ -339,14 +337,5 @@ protected List<Class<?>> getValidationGroups() { addValidationGroup(UpdateEntity.class); return super.getValidationGroups(); - } - - protected VdsStaticDAO getVdsStaticDAO() { - return getDbFacade().getVdsStaticDao(); - } - - @Override - protected NetworkDAO getNetworkDAO() { - return getDbFacade().getNetworkDao(); } } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmCommand.java index add83a1..585e33c 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmCommand.java @@ -490,7 +490,7 @@ } protected VmDeviceDAO getVmDeviceDao() { - return getDbFacade().getVmDeviceDao(); + return getVmDeviceDao(); } /** Overriding to allow spying from this package */ @@ -500,19 +500,19 @@ } protected VmDynamicDAO getVmDynamicDao() { - return getDbFacade().getVmDynamicDao(); + return getVmDynamicDao(); } protected TagDAO getTagDao() { - return getDbFacade().getTagDao(); + return getTagDao(); } protected DiskDao getDiskDao() { - return getDbFacade().getDiskDao(); + return getDiskDao(); } protected DiskImageDAO getDiskImageDao() { - return getDbFacade().getDiskImageDao(); + return getDiskImageDao(); } protected boolean checkPayload(VmPayload payload, String isoPath) { diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/quota/ChangeQuotaCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/quota/ChangeQuotaCommand.java index df21b44..69ffb3b 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/quota/ChangeQuotaCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/quota/ChangeQuotaCommand.java @@ -32,7 +32,7 @@ addCanDoActionMessage(VdcBllMessages.ACTION_TYPE_FAILED_QUOTA_IS_NOT_VALID); return false; } - if (getDbFacade().getQuotaDao().getById(getQuotaId()) == null) { + if (getQuotaDAO().getById(getQuotaId()) == null) { addCanDoActionMessage(VdcBllMessages.ACTION_TYPE_FAILED_QUOTA_NOT_EXIST); return false; } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/AddStorageServerConnectionCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/AddStorageServerConnectionCommand.java index 3231f92..40af333 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/AddStorageServerConnectionCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/AddStorageServerConnectionCommand.java @@ -2,6 +2,8 @@ import java.util.List; +import javax.inject.Inject; + import org.apache.commons.lang.StringUtils; import org.ovirt.engine.core.bll.InternalCommandAttribute; import org.ovirt.engine.core.common.action.StorageServerConnectionParametersBase; @@ -14,11 +16,18 @@ import org.ovirt.engine.core.compat.Guid; import org.ovirt.engine.core.dal.VdcBllMessages; import org.ovirt.engine.core.dal.dbbroker.DbFacade; +import org.ovirt.engine.core.dal.dbbroker.DbFacadeFactory; +import org.ovirt.engine.core.dao.StorageServerConnectionDAO; @SuppressWarnings("serial") @InternalCommandAttribute public class AddStorageServerConnectionCommand<T extends StorageServerConnectionParametersBase> extends ConnectStorageToVdsCommand<T> { + + @Inject + @DbFacadeFactory + private StorageServerConnectionDAO storageServerConnectionDAO; + public AddStorageServerConnectionCommand(T parameters) { super(parameters); } @@ -31,14 +40,18 @@ // Add storage Connection to the database. if (isValidConnection && (StringUtils.isNotEmpty(currConnection.getid()) - || getDbFacade().getStorageServerConnectionDao().get(currConnection.getid()) == null)) { + || getStorageServerConnectionDao().get(currConnection.getid()) == null)) { currConnection.setid(Guid.NewGuid().toString()); - getDbFacade().getStorageServerConnectionDao().save(currConnection); + getStorageServerConnectionDao().save(currConnection); } getReturnValue().setActionReturnValue(getConnection().getid()); setSucceeded(true); } + private StorageServerConnectionDAO getStorageServerConnectionDao() { + return storageServerConnectionDAO; + } + @Override protected storage_server_connections getConnection() { if (StringUtils.isEmpty(getParameters().getStorageServerConnection().getid())) { diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/ConnectAllHostsToLunCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/ConnectAllHostsToLunCommand.java index 0de4941..0d549e9 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/ConnectAllHostsToLunCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/ConnectAllHostsToLunCommand.java @@ -86,7 +86,7 @@ //fail final ConnectAllHostsToLunCommandReturnValue result = getResult(); result.setFailedVds(spmVds); - result.setFailedLun(getDbFacade().getLunDao() + result.setFailedLun(getLunDAO() .get(lunId)); return; } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/DeactivateStorageDomainCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/DeactivateStorageDomainCommand.java index f7d1d41..c33bb1a 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/DeactivateStorageDomainCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/DeactivateStorageDomainCommand.java @@ -239,7 +239,7 @@ */ private void notifyAsyncTasks() { final List<Guid> asyncTasks = - getDbFacade().getAsyncTaskDao() + getAsyncTaskDao() .getAsyncTaskIdsByEntity(getParameters().getStorageDomainId()); if (!asyncTasks.isEmpty()) { diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/RemoveStorageDomainCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/RemoveStorageDomainCommand.java index 858751d..b4f3c62 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/RemoveStorageDomainCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/RemoveStorageDomainCommand.java @@ -3,6 +3,8 @@ import java.util.Collections; import java.util.Map; +import javax.inject.Inject; + import org.ovirt.engine.core.bll.LockIdNameAttribute; import org.ovirt.engine.core.bll.NonTransactiveCommandAttribute; import org.ovirt.engine.core.common.AuditLogType; @@ -23,6 +25,9 @@ import org.ovirt.engine.core.common.vdscommands.VDSCommandType; import org.ovirt.engine.core.compat.Guid; import org.ovirt.engine.core.dal.VdcBllMessages; +import org.ovirt.engine.core.dal.dbbroker.DbFacadeFactory; +import org.ovirt.engine.core.dao.StorageDomainDynamicDAO; +import org.ovirt.engine.core.dao.StorageDomainStaticDAO; import org.ovirt.engine.core.utils.transaction.TransactionMethod; @LockIdNameAttribute @@ -31,6 +36,21 @@ public RemoveStorageDomainCommand(T parameters) { super(parameters); setVdsId(parameters.getVdsId()); + } + + @Inject + @DbFacadeFactory + private StorageDomainDynamicDAO storageDomainDynamicDAO; + @Inject + @DbFacadeFactory + private StorageDomainStaticDAO storageDomainStaticDAO; + + public StorageDomainDynamicDAO getStorageDomainDynamicDAO() { + return storageDomainDynamicDAO; + } + + public StorageDomainStaticDAO getStorageDomainStaticDAO() { + return storageDomainStaticDAO; } @Override @@ -63,8 +83,8 @@ @Override public Object runInTransaction() { getStorageHelper(dom).StorageDomainRemoved(dom.getStorageStaticData()); - getDbFacade().getStorageDomainDynamicDao().remove(dom.getId()); - getDbFacade().getStorageDomainStaticDao().remove(dom.getId()); + getStorageDomainDynamicDAO().remove(dom.getId()); + getStorageDomainStaticDAO().remove(dom.getId()); return null; } }); @@ -173,7 +193,7 @@ Guid storageDomainId = storageDomain.getId(); Guid storagePoolId = storageDomain.getstorage_pool_id().getValue(); - return getDbFacade().getStoragePoolIsoMapDao() + return getStoragePoolIsoMapDAO() .get(new StoragePoolIsoMapId(storageDomainId, storagePoolId)) != null; } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/StorageDomainCommandBase.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/StorageDomainCommandBase.java index b03719b..e9a14a9 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/StorageDomainCommandBase.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/StorageDomainCommandBase.java @@ -5,6 +5,8 @@ import java.util.Comparator; import java.util.List; +import javax.inject.Inject; + import org.ovirt.engine.core.bll.context.CompensationContext; import org.ovirt.engine.core.bll.utils.PermissionSubject; import org.ovirt.engine.core.common.VdcObjectType; @@ -26,9 +28,11 @@ import org.ovirt.engine.core.compat.NGuid; import org.ovirt.engine.core.dal.VdcBllMessages; import org.ovirt.engine.core.dal.dbbroker.DbFacade; +import org.ovirt.engine.core.dal.dbbroker.DbFacadeFactory; import org.ovirt.engine.core.dao.DiskImageDAO; import org.ovirt.engine.core.dao.DiskImageDynamicDAO; import org.ovirt.engine.core.dao.ImageStorageDomainMapDao; +import org.ovirt.engine.core.dao.LunDAO; import org.ovirt.engine.core.dao.StorageDomainStaticDAO; import org.ovirt.engine.core.dao.StoragePoolIsoMapDAO; import org.ovirt.engine.core.dao.StorageServerConnectionDAO; @@ -42,6 +46,10 @@ StorageHandlingCommandBase<T> { private storage_pool _storagePool; + + @Inject + @DbFacadeFactory + private LunDAO lunDAO; public StorageDomainCommandBase(T parameters) { super(parameters); @@ -364,4 +372,9 @@ : ((o1.getLastTimeUsedAsMaster() == o2.getLastTimeUsedAsMaster()) ? 0 : 1); } } + + public LunDAO getLunDAO() { + return lunDAO; + } + } diff --git a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/auditloghandling/AuditLogableBase.java b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/auditloghandling/AuditLogableBase.java index bf2f92c..54376d6 100644 --- a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/auditloghandling/AuditLogableBase.java +++ b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/auditloghandling/AuditLogableBase.java @@ -24,16 +24,23 @@ import org.ovirt.engine.core.dal.dbbroker.DbFacadeFactory; import org.ovirt.engine.core.dao.AdGroupDAO; import org.ovirt.engine.core.dao.DbUserDAO; +import org.ovirt.engine.core.dao.DiskDao; +import org.ovirt.engine.core.dao.ImageDao; +import org.ovirt.engine.core.dao.InterfaceDAO; import org.ovirt.engine.core.dao.NetworkClusterDAO; import org.ovirt.engine.core.dao.NetworkDAO; import org.ovirt.engine.core.dao.PermissionDAO; +import org.ovirt.engine.core.dao.QuotaDAO; import org.ovirt.engine.core.dao.RoleDAO; import org.ovirt.engine.core.dao.RoleGroupMapDAO; +import org.ovirt.engine.core.dao.SnapshotDao; import org.ovirt.engine.core.dao.StorageDomainDAO; import org.ovirt.engine.core.dao.StoragePoolDAO; import org.ovirt.engine.core.dao.VdsDAO; import org.ovirt.engine.core.dao.VdsGroupDAO; +import org.ovirt.engine.core.dao.VdsStaticDAO; import org.ovirt.engine.core.dao.VmDAO; +import org.ovirt.engine.core.dao.VmDeviceDAO; import org.ovirt.engine.core.dao.VmNetworkInterfaceDAO; import org.ovirt.engine.core.dao.VmStaticDAO; import org.ovirt.engine.core.dao.VmStatisticsDAO; @@ -122,6 +129,27 @@ @Inject @DbFacadeFactory private NetworkDAO networkDao; + @Inject + @DbFacadeFactory + private InterfaceDAO interfaceDao; + @Inject + @DbFacadeFactory + private ImageDao ImageDao; + @Inject + @DbFacadeFactory + private DiskDao diskDao; + @Inject + @DbFacadeFactory + private SnapshotDao snapshotDao; + @Inject + @DbFacadeFactory + private VdsStaticDAO vdsStaticDAO; + @Inject + @DbFacadeFactory + private QuotaDAO quotaDAO; + @Inject + @DbFacadeFactory + private VmDeviceDAO vmDeviceDAO; public AuditLogableBase() { } @@ -604,6 +632,34 @@ return networkDao; } + protected InterfaceDAO getInterfaceDAO() { + return interfaceDao; + } + + protected ImageDao getImageDao() { + return ImageDao; + } + + protected DiskDao getDiskDao() { + return diskDao; + } + + public SnapshotDao getSnapshotDao() { + return snapshotDao; + } + + protected VdsStaticDAO getVdsStaticDAO() { + return vdsStaticDAO; + } + + protected QuotaDAO getQuotaDAO() { + return quotaDAO; + } + + protected VmDeviceDAO getVmDeviceDao() { + return vmDeviceDAO; + } + protected DbFacade getDbFacade() { return db; } -- To view, visit http://gerrit.ovirt.org/9811 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Icba2ba98a7581c74dcecf67a75f55f2d7d8a1ffc Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Roy Golan <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
