[Engine-patches] Change in ovirt-engine[master]: core: Use storage validator when validating move or copy.

[mlipchuk]

Maor Lipchuk has uploaded a new change for review.

Change subject: core: Use storage validator when validating move or copy.
......................................................................

core: Use storage validator when validating move or copy.

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

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


  git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/13/11513/1

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 d90867a..4a8cf6d 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
@@ -147,25 +147,20 @@
      * @return
      */
     protected boolean validateSpaceRequirements() {
-        boolean retValue = true;
         if (!isStorageDomainSpaceWithinThresholds()) {
-            retValue = false;
-            
addCanDoActionMessage(VdcBllMessages.ACTION_TYPE_FAILED_DISK_SPACE_LOW_ON_TARGET_STORAGE_DOMAIN);
-            addCanDoActionMessage(String.format("$%1$s %2$s", "storageName", 
getStorageDomain().getstorage_name()));
+            return false;
         }
 
-        if (retValue) {
-            getImage().getSnapshots().addAll(getAllImageSnapshots());
-            if 
(!doesStorageDomainHaveSpaceForRequest(Math.round(getImage().getActualDiskWithSnapshotsSize())))
 {
-                
addCanDoActionMessage(VdcBllMessages.ACTION_TYPE_FAILED_DISK_SPACE_LOW);
-                retValue = false;
-            }
+        getImage().getSnapshots().addAll(getAllImageSnapshots());
+        if 
(!doesStorageDomainHaveSpaceForRequest(Math.round(getImage().getActualDiskWithSnapshotsSize())))
 {
+            
addCanDoActionMessage(VdcBllMessages.ACTION_TYPE_FAILED_DISK_SPACE_LOW);
+            return false;
         }
-        return retValue;
+        return true;
     }
 
     protected boolean isStorageDomainSpaceWithinThresholds() {
-        return 
StorageDomainSpaceChecker.isWithinThresholds(getStorageDomain());
+        return validate(new 
StorageDomainValidator(getStorageDomain()).isDomainWithinThresholds());
     }
 
     protected List<DiskImage> getAllImageSnapshots() {


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

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