Arik Hadas has uploaded a new change for review.
Change subject: core: organize MoveOrCopyTemplateCommand#canDoAction
......................................................................
core: organize MoveOrCopyTemplateCommand#canDoAction
Change it to match the structure of:
if (!<check>) {
return false/failCanDoAction..
}
...
return true;
Change-Id: If5575262d7f4623000e957dd88d6aa892aab08ce
Signed-off-by: Arik Hadas <[email protected]>
---
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MoveOrCopyTemplateCommand.java
1 file changed, 33 insertions(+), 25 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/76/32376/1
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MoveOrCopyTemplateCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MoveOrCopyTemplateCommand.java
index d8edf59..da13cd9 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MoveOrCopyTemplateCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MoveOrCopyTemplateCommand.java
@@ -111,44 +111,52 @@
@Override
protected boolean canDoAction() {
- boolean retValue = true;
if (getVmTemplate() == null) {
- retValue = false;
-
addCanDoActionMessage(VdcBllMessages.ACTION_TYPE_FAILED_TEMPLATE_DOES_NOT_EXIST);
- } else if (getTemplateDisks() != null &&
!getTemplateDisks().isEmpty()) {
+ return
failCanDoAction(VdcBllMessages.ACTION_TYPE_FAILED_TEMPLATE_DOES_NOT_EXIST);
+ }
+
+ if (getTemplateDisks() != null && !getTemplateDisks().isEmpty()) {
ensureDomainMap(getTemplateDisks(),
getParameters().getStorageDomainId());
// check that images are ok
ImagesHandler.fillImagesMapBasedOnTemplate(getVmTemplate(),
imageFromSourceDomainMap,
null, true);
+
if (getVmTemplate().getDiskTemplateMap().values().size() !=
imageFromSourceDomainMap.size()) {
log.errorFormat("Can not found any default active domain for
one of the disks of template with id : {0}",
getVmTemplate().getId());
-
addCanDoActionMessage(VdcBllMessages.ACTION_TYPE_FAILED_MISSED_STORAGES_FOR_SOME_DISKS);
- retValue = false;
+ return
failCanDoAction(VdcBllMessages.ACTION_TYPE_FAILED_MISSED_STORAGES_FOR_SOME_DISKS);
}
- retValue = retValue
- &&
VmTemplateCommand.isVmTemplateImagesReady(getVmTemplate(), null,
- getReturnValue().getCanDoActionMessages(), true,
true, true, false, getTemplateDisks());
- if (retValue) {
- setStoragePoolId(getVmTemplate().getStoragePoolId());
- retValue =
- checkStorageDomain()
- &&
checkStorageDomainStatus(StorageDomainStatus.Active)
- && (getParameters().getForceOverride() ||
(!isImagesAlreadyOnTarget() && checkIfDisksExist(getTemplateDisks())))
- &&
checkFreeSpaceOnDestinationDomain(getStorageDomain(),
- (int)
getVmTemplate().getActualDiskSize());
+
+ if (!VmTemplateCommand.isVmTemplateImagesReady(getVmTemplate(),
null,
+ getReturnValue().getCanDoActionMessages(), true, true,
true, false, getTemplateDisks())) {
+ return false;
}
- if (retValue
- && DbFacade.getInstance()
- .getStoragePoolIsoMapDao()
- .get(new
StoragePoolIsoMapId(getStorageDomain().getId(),
- getVmTemplate().getStoragePoolId())) ==
null) {
- retValue = false;
-
addCanDoActionMessage(VdcBllMessages.ACTION_TYPE_FAILED_STORAGE_POOL_NOT_MATCH);
+
+ setStoragePoolId(getVmTemplate().getStoragePoolId());
+ if (!checkStorageDomain()) {
+ return false;
+ }
+
+ if (!checkStorageDomainStatus(StorageDomainStatus.Active)) {
+ return false;
+ }
+
+ if (!(getParameters().getForceOverride() ||
(!isImagesAlreadyOnTarget() && checkIfDisksExist(getTemplateDisks())))) {
+ return false;
+ }
+
+ if (!checkFreeSpaceOnDestinationDomain(getStorageDomain(), (int)
getVmTemplate().getActualDiskSize())) {
+ return false;
+ }
+
+ if (getDbFacade().getStoragePoolIsoMapDao()
+ .get(new StoragePoolIsoMapId(getStorageDomain().getId(),
getVmTemplate().getStoragePoolId())) == null) {
+ return
failCanDoAction(VdcBllMessages.ACTION_TYPE_FAILED_STORAGE_POOL_NOT_MATCH);
}
}
- return retValue;
+
+ return true;
}
protected boolean validateUnregisteredEntity(IVdcQueryable
entityFromConfiguration, OvfEntityData ovfEntityData) {
--
To view, visit http://gerrit.ovirt.org/32376
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If5575262d7f4623000e957dd88d6aa892aab08ce
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Arik Hadas <[email protected]>
_______________________________________________
Engine-patches mailing list
[email protected]
http://lists.ovirt.org/mailman/listinfo/engine-patches
