[Engine-patches] Change in ovirt-engine[master]: core: Change DeactivateStorageDomain CDA to use failCanDoAction

[mlipchuk]

Maor Lipchuk has uploaded a new change for review.

Change subject: core: Change DeactivateStorageDomain CDA to use failCanDoAction
......................................................................

core: Change DeactivateStorageDomain CDA to use failCanDoAction

Changing all the return false in the CDA to use one line of
failCanDoAction

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


  git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/39/22639/1

diff --git 
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/DeactivateStorageDomainCommand.java
 
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/DeactivateStorageDomainCommand.java
index ab6ad40..fc399cd 100644
--- 
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/DeactivateStorageDomainCommand.java
+++ 
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/DeactivateStorageDomainCommand.java
@@ -105,33 +105,28 @@
             });
 
             if (!activeDomains.isEmpty() && dataDomains.isEmpty()) {
-                
addCanDoActionMessage(VdcBllMessages.ERROR_CANNOT_DEACTIVATE_MASTER_WITH_NON_DATA_DOMAINS);
-                return false;
+                return 
failCanDoAction(VdcBllMessages.ERROR_CANNOT_DEACTIVATE_MASTER_WITH_NON_DATA_DOMAINS);
             }
 
             if (!filterDomainsByStatus(domains, 
StorageDomainStatus.Locked).isEmpty()) {
-                
addCanDoActionMessage(VdcBllMessages.ERROR_CANNOT_DEACTIVATE_MASTER_WITH_LOCKED_DOMAINS);
-                return false;
+                return 
failCanDoAction(VdcBllMessages.ERROR_CANNOT_DEACTIVATE_MASTER_WITH_LOCKED_DOMAINS);
             }
         }
         if (!getParameters().getIsInternal()
                 && !getVmDAO()
                         
.getAllActiveForStorageDomain(getStorageDomain().getId())
                         .isEmpty()) {
-            
addCanDoActionMessage(VdcBllMessages.ACTION_TYPE_FAILED_DETECTED_ACTIVE_VMS);
-            return false;
+            return 
failCanDoAction(VdcBllMessages.ACTION_TYPE_FAILED_DETECTED_ACTIVE_VMS);
         }
         if (getStoragePool().getspm_vds_id() != null) {
             // In case there are running tasks in the pool, it is impossible 
to deactivate the master storage domain
             if (getStorageDomain().getStorageDomainType() == 
StorageDomainType.Master &&
                     
getAsyncTaskDao().getAsyncTaskIdsByStoragePoolId(getStorageDomain().getStoragePoolId()).size()
 > 0) {
-                
addCanDoActionMessage(VdcBllMessages.ERROR_CANNOT_DEACTIVATE_MASTER_DOMAIN_WITH_TASKS_ON_POOL);
-                return false;
+                return 
failCanDoAction(VdcBllMessages.ERROR_CANNOT_DEACTIVATE_MASTER_DOMAIN_WITH_TASKS_ON_POOL);
             } else if (getStorageDomain().getStorageDomainType() != 
StorageDomainType.ISO &&
                     !getParameters().getIsInternal()
                     && 
getAsyncTaskDao().getAsyncTaskIdsByEntity(getParameters().getStorageDomainId()).size()
 > 0) {
-               
addCanDoActionMessage(VdcBllMessages.ERROR_CANNOT_DEACTIVATE_DOMAIN_WITH_TASKS);
-               return false;
+               return 
failCanDoAction(VdcBllMessages.ERROR_CANNOT_DEACTIVATE_DOMAIN_WITH_TASKS);
             }
         }
         return true;


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

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