[Engine-patches] Change in ovirt-engine[master]: core: Use storage validator when validating add disk.

[mlipchuk]

Maor Lipchuk has uploaded a new change for review.

Change subject: core: Use storage validator when validating add disk.
......................................................................

core: Use storage validator when validating add disk.

Use storage validator instead regular check when validating space
requirements in the CDA phase.

Change-Id: I8bb5101600aa22271529fb72fb33b2031ee81f83
Signed-off-by: Maor Lipchuk <mlipc...@redhat.com>
---
M 
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddDiskCommand.java
1 file changed, 3 insertions(+), 11 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/84/11584/1

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 f887439..bb43231 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
@@ -6,7 +6,6 @@
 import java.util.Map;
 
 import org.apache.commons.lang.StringUtils;
-import org.ovirt.engine.core.bll.command.utils.StorageDomainSpaceChecker;
 import org.ovirt.engine.core.bll.job.ExecutionHandler;
 import org.ovirt.engine.core.bll.quota.QuotaConsumptionParameter;
 import org.ovirt.engine.core.bll.quota.QuotaStorageConsumptionParameter;
@@ -136,7 +135,7 @@
         returnValue =
                 validate(new 
StorageDomainValidator(getStorageDomain()).isDomainExistAndActive()) &&
                 checkImageConfiguration() &&
-                checkFreeSpace() &&
+                hasFreeSpace(getStorageDomain()) &&
                 checkExceedingMaxBlockDiskSize() &&
                 canAddShareableDisk();
 
@@ -180,13 +179,6 @@
         if (getStoragePoolIsoMapDao().get(new StoragePoolIsoMapId(
             getStorageDomainId().getValue(), vm.getStoragePoolId())) == null) {
             return 
failCanDoAction(VdcBllMessages.ACTION_TYPE_FAILED_STORAGE_POOL_OF_VM_NOT_MATCH);
-        }
-        return true;
-    }
-
-    private boolean checkFreeSpace() {
-        if (!hasFreeSpace(getStorageDomain())) {
-            return 
failCanDoAction(VdcBllMessages.ACTION_TYPE_FAILED_DISK_SPACE_LOW);
         }
         return true;
     }
@@ -237,11 +229,11 @@
     }
 
     protected boolean doesStorageDomainhaveSpaceForRequest(storage_domains 
storageDomain) {
-        return StorageDomainSpaceChecker.hasSpaceForRequest(storageDomain, 
getDiskImageInfo().getSizeInGigabytes());
+        return validate(new 
StorageDomainValidator(storageDomain).isDomainHasSpaceForRequest(getDiskImageInfo().getSizeInGigabytes()));
     }
 
     protected boolean isStorageDomainWithinThresholds(storage_domains 
storageDomain) {
-        return StorageDomainSpaceChecker.isWithinThresholds(storageDomain);
+        return validate(new 
StorageDomainValidator(storageDomain).isDomainWithinThresholds());
     }
 
     /** @return The disk from the parameters, cast to a {@link DiskImage} */


--
To view, visit http://gerrit.ovirt.org/11584
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8bb5101600aa22271529fb72fb33b2031ee81f83
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Maor Lipchuk <mlipc...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches