Allon Mureinik has uploaded a new change for review.
Change subject: core: ImportVm cleanup: DAO accessors
......................................................................
core: ImportVm cleanup: DAO accessors
Cleaned up DAO access in ImportVmCommand.
Replaced all instances of DbFacade.getInstance().getXXDao() with
protected getXXDao() methods, and moved available methods to their
correct place in the hierarchy.
Change-Id: I331be144f94df2b7527e9b36289347109d4b266d
Signed-off-by: Allon Mureinik <amure...@redhat.com>
---
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/storage/StorageDomainCommandBase.java
M
backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/auditloghandling/AuditLogableBase.java
3 files changed, 37 insertions(+), 31 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/14/9614/1
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 1eb4335..3bea4cc 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
@@ -65,11 +65,8 @@
import org.ovirt.engine.core.common.vdscommands.VDSReturnValue;
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.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;
import org.ovirt.engine.core.utils.linq.LinqUtils;
@@ -324,8 +321,7 @@
if (retVal && getParameters().getCopyCollapse() &&
!templateExistsOnExportDomain()) {
addCanDoActionMessage(VdcBllMessages.ACTION_TYPE_FAILED_IMPORTED_TEMPLATE_IS_MISSING);
addCanDoActionMessage(String.format("$DomainName %1$s",
-
getStorageDomainStaticDAO().get(getParameters().getSourceDomainId())
- .getstorage_name()));
+
getStorageDomainStaticDAO().get(getParameters().getSourceDomainId()).getstorage_name()));
retVal = false;
}
@@ -381,11 +377,6 @@
addCanDoActionMessage(VdcBllMessages.VAR__TYPE__VM);
}
return retVal;
- }
-
- @Override
- protected StorageDomainStaticDAO getStorageDomainStaticDAO() {
- return DbFacade.getInstance().getStorageDomainStaticDao();
}
private boolean templateExistsOnExportDomain() {
@@ -623,11 +614,11 @@
disk.setcreation_date(new Date());
BaseImagesCommand.saveImage(disk);
ImagesHandler.setDiskAlias(disk, getVm());
- DbFacade.getInstance().getBaseDiskDao().save(disk);
+ getBaseDiskDao().save(disk);
DiskImageDynamic diskDynamic = new DiskImageDynamic();
diskDynamic.setId(disk.getImageId());
diskDynamic.setactual_size(disk.getactual_size());
-
DbFacade.getInstance().getDiskImageDynamicDao().save(diskDynamic);
+ getDiskImageDynamicDAO().save(diskDynamic);
}
Snapshot snapshot = new
SnapshotsManager().addActiveSnapshot(snapshotId, getVm(),
getCompensationContext());
@@ -656,7 +647,7 @@
DiskImageDynamic diskDynamic = new DiskImageDynamic();
diskDynamic.setId(disk.getImageId());
diskDynamic.setactual_size(disk.getactual_size());
-
DbFacade.getInstance().getDiskImageDynamicDao().save(diskDynamic);
+ getDiskImageDynamicDAO().save(diskDynamic);
}
for (Guid id : images.keySet()) {
@@ -664,8 +655,8 @@
DiskImage disk = list.get(list.size() - 1);
snapshotId = disk.getvm_snapshot_id().getValue();
disk.setactive(true);
- DbFacade.getInstance().getImageDao().update(disk.getImage());
- DbFacade.getInstance().getBaseDiskDao().save(disk);
+ getImageDao().update(disk.getImage());
+ getBaseDiskDao().save(disk);
}
// Update active snapshot's data, since it was inserted as a
regular snapshot.
@@ -695,10 +686,6 @@
}
}
}
- }
-
- protected SnapshotDao getSnapshotDao() {
- return DbFacade.getInstance().getSnapshotDao();
}
// the last image in each list is the leaf
@@ -776,7 +763,7 @@
if (getParameters().getCopyCollapse()) {
getVm().setvmt_guid(VmTemplateHandler.BlankVmTemplateId);
}
- DbFacade.getInstance().getVmStaticDao().save(getVm().getStaticData());
+ getVmStaticDAO().save(getVm().getStaticData());
getCompensationContext().snapshotNewEntity(getVm().getStaticData());
}
@@ -787,7 +774,7 @@
minAllocatedMem = getVm().getMinAllocatedMem();
} else {
// first get cluster memory over commit value
- VDSGroup vdsGroup =
DbFacade.getInstance().getVdsGroupDao().get(getVm().getvds_group_id());
+ VDSGroup vdsGroup =
getVdsGroupDAO().get(getVm().getvds_group_id());
if (vdsGroup != null && vdsGroup.getmax_vds_memory_over_commit() >
0) {
minAllocatedMem = (vmMem * 100) /
vdsGroup.getmax_vds_memory_over_commit();
}
@@ -863,14 +850,14 @@
tempVar.setvm_host("");
tempVar.setvm_ip("");
tempVar.setapp_list(getParameters().getVm().getDynamicData().getapp_list());
- DbFacade.getInstance().getVmDynamicDao().save(tempVar);
+ getVmDynamicDAO().save(tempVar);
getCompensationContext().snapshotNewEntity(tempVar);
}
private void addVmStatistics() {
VmStatistics stats = new VmStatistics();
stats.setId(getVmId());
- DbFacade.getInstance().getVmStatisticsDao().save(stats);
+ getVmStatisticsDAO().save(stats);
getCompensationContext().snapshotNewEntity(stats);
getCompensationContext().stateChanged();
}
@@ -888,21 +875,20 @@
if (getVm() != null) {
VmHandler.UnLockVm(getVm());
for (DiskImage disk : imageList) {
-
DbFacade.getInstance().getDiskImageDynamicDao().remove(disk.getImageId());
- DbFacade.getInstance().getImageDao().remove(disk.getImageId());
+ getDiskImageDynamicDAO().remove(disk.getImageId());
+ getImageDao().remove(disk.getImageId());
- List<DiskImage> imagesForDisk =
-
DbFacade.getInstance().getDiskImageDao().getAllSnapshotsForImageGroup(disk.getId());
+ List<DiskImage> imagesForDisk =
getDiskImageDao().getAllSnapshotsForImageGroup(disk.getId());
if (imagesForDisk == null || imagesForDisk.isEmpty()) {
-
DbFacade.getInstance().getBaseDiskDao().remove(disk.getId());
+ getBaseDiskDao().remove(disk.getId());
}
}
removeVmNetworkInterfaces();
new SnapshotsManager().removeSnapshots(getVm().getId());
- DbFacade.getInstance().getVmDynamicDao().remove(getVmId());
- DbFacade.getInstance().getVmStatisticsDao().remove(getVmId());
+ getVmDynamicDAO().remove(getVmId());
+ getVmStatisticsDAO().remove(getVmId());
new SnapshotsManager().removeSnapshots(getVmId());
- DbFacade.getInstance().getVmStaticDao().remove(getVmId());
+ getVmStaticDAO().remove(getVmId());
setSucceeded(true);
} else {
setVm(vmFromParams); // Setting VM from params, for logging
purposes
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..0a8af0a 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
@@ -26,9 +26,12 @@
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.dao.BaseDiskDao;
import org.ovirt.engine.core.dao.DiskImageDAO;
import org.ovirt.engine.core.dao.DiskImageDynamicDAO;
+import org.ovirt.engine.core.dao.ImageDao;
import org.ovirt.engine.core.dao.ImageStorageDomainMapDao;
+import org.ovirt.engine.core.dao.SnapshotDao;
import org.ovirt.engine.core.dao.StorageDomainStaticDAO;
import org.ovirt.engine.core.dao.StoragePoolIsoMapDAO;
import org.ovirt.engine.core.dao.StorageServerConnectionDAO;
@@ -325,6 +328,14 @@
return getDbFacade().getStoragePoolIsoMapDao();
}
+ protected BaseDiskDao getBaseDiskDao() {
+ return getDbFacade().getBaseDiskDao();
+ }
+
+ protected ImageDao getImageDao() {
+ return getDbFacade().getImageDao();
+ }
+
protected DiskImageDAO getDiskImageDao() {
return getDbFacade().getDiskImageDao();
}
@@ -333,6 +344,10 @@
return getDbFacade().getDiskImageDynamicDao();
}
+ protected SnapshotDao getSnapshotDao() {
+ return getDbFacade().getSnapshotDao();
+ }
+
protected ImageStorageDomainMapDao getImageStorageDomainMapDao() {
return getDbFacade().getImageStorageDomainMapDao();
}
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 2ed527b..65922a9 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
@@ -32,6 +32,7 @@
import org.ovirt.engine.core.dao.VdsDAO;
import org.ovirt.engine.core.dao.VdsGroupDAO;
import org.ovirt.engine.core.dao.VmDAO;
+import org.ovirt.engine.core.dao.VmDynamicDAO;
import org.ovirt.engine.core.dao.VmNetworkInterfaceDAO;
import org.ovirt.engine.core.dao.VmStaticDAO;
import org.ovirt.engine.core.dao.VmStatisticsDAO;
@@ -509,6 +510,10 @@
return getDbFacade().getVmStaticDao();
}
+ public VmDynamicDAO getVmDynamicDAO() {
+ return getDbFacade().getVmDynamicDao();
+ }
+
protected VmStatisticsDAO getVmStatisticsDAO() {
return getDbFacade().getVmStatisticsDao();
}
--
To view, visit http://gerrit.ovirt.org/9614
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I331be144f94df2b7527e9b36289347109d4b266d
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Allon Mureinik <amure...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
