[Engine-patches] Change in ovirt-engine[master]: core: Use storage validator when adding template.

[mlipchuk]

Maor Lipchuk has uploaded a new change for review.

Change subject: core: Use storage validator when adding template.
......................................................................

core: Use storage validator when adding template.

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

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


  git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/85/11585/1

diff --git 
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmTemplateCommand.java
 
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmTemplateCommand.java
index bb8bce6..9c3a115 100644
--- 
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmTemplateCommand.java
+++ 
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmTemplateCommand.java
@@ -8,7 +8,6 @@
 import java.util.Map;
 import java.util.Set;
 
-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;
@@ -259,8 +258,7 @@
                         storageDomains,
                         diskInfoDestinationMap);
         for (Map.Entry<storage_domains, Integer> entry : domainMap.entrySet()) 
{
-            if (!StorageDomainSpaceChecker.hasSpaceForRequest(entry.getKey(), 
entry.getValue())) {
-                
addCanDoActionMessage(VdcBllMessages.ACTION_TYPE_FAILED_DISK_SPACE_LOW);
+            if (!doesStorageDomainhaveSpaceForRequest(entry.getKey(), 
entry.getValue())) {
                 return false;
             }
         }
@@ -269,6 +267,10 @@
                         .getcompatibility_version().toString(), 
getReturnValue().getCanDoActionMessages());
     }
 
+    protected boolean doesStorageDomainhaveSpaceForRequest(storage_domains 
storageDomain, long spaceForRequest) {
+        return validate(new 
StorageDomainValidator(storageDomain).isDomainHasSpaceForRequest(spaceForRequest));
+    }
+
     protected boolean validateVmNotDuringSnapshot() {
         return validate(new 
SnapshotsValidator().vmNotDuringSnapshot(getVmId()));
     }


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: If36ba750308adb2751a02738f66816fb097fe93e
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