[Engine-patches] Change in ovirt-engine[master]: engine: Use proper dao api to detect used network

[masayag]

Moti Asayag has uploaded a new change for review.

Change subject: engine: Use proper dao api to detect used network
......................................................................

engine: Use proper dao api to detect used network

The patch simplifies the code of RemoveNetworkCommand by
removing redundant code and using a proper method of the
NetworkDao in order to detect if a specific network is
used by a cluster instead of iterating all the cluster's
networks.

Change-Id: I95419986b99c23a741d28929532619f4c56da5a4
Signed-off-by: Moti Asayag <masa...@redhat.com>
---
M 
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/RemoveNetworkCommand.java
1 file changed, 6 insertions(+), 17 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/33/9833/1

diff --git 
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/RemoveNetworkCommand.java
 
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/RemoveNetworkCommand.java
index 4f722a3..83abd8d 100644
--- 
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/RemoveNetworkCommand.java
+++ 
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/RemoveNetworkCommand.java
@@ -4,12 +4,10 @@
 
 import org.ovirt.engine.core.common.AuditLogType;
 import org.ovirt.engine.core.common.action.AddNetworkStoragePoolParameters;
-import org.ovirt.engine.core.common.businessentities.VDSGroup;
 import org.ovirt.engine.core.common.businessentities.Network;
+import org.ovirt.engine.core.common.businessentities.VDSGroup;
 import org.ovirt.engine.core.dal.VdcBllMessages;
 import org.ovirt.engine.core.dal.dbbroker.DbFacade;
-import org.ovirt.engine.core.utils.linq.LinqUtils;
-import org.ovirt.engine.core.utils.linq.Predicate;
 
 public class RemoveNetworkCommand<T extends AddNetworkStoragePoolParameters> 
extends NetworkCommon<T> {
     public RemoveNetworkCommand(T parameters) {
@@ -18,7 +16,7 @@
 
     @Override
     protected void executeCommand() {
-        
DbFacade.getInstance().getNetworkDao().remove(getParameters().getNetwork().getId());
+        getNetworkDAO().remove(getParameters().getNetwork().getId());
         setSucceeded(true);
     }
 
@@ -27,11 +25,7 @@
         addCanDoActionMessage(VdcBllMessages.VAR__ACTION__REMOVE);
         addCanDoActionMessage(VdcBllMessages.VAR__TYPE__NETWORK);
 
-        boolean retVal = true;
-        if (retVal) {
-            retVal = CommonNetworkValidation(getParameters().getNetwork(), 
getReturnValue().getCanDoActionMessages());
-        }
-        return retVal;
+        return CommonNetworkValidation(getParameters().getNetwork(), 
getReturnValue().getCanDoActionMessages());
     }
 
     public static boolean CommonNetworkValidation(final Network network, 
java.util.ArrayList<String> canDoActionMessages) {
@@ -40,15 +34,10 @@
             List<VDSGroup> groups = 
DbFacade.getInstance().getVdsGroupDao().getAllForStoragePool(
                     network.getstorage_pool_id().getValue());
             for (VDSGroup cluster : groups) {
-                List<Network> networks = DbFacade.getInstance().getNetworkDao()
-                        .getAllForCluster(cluster.getId());
+                Network removedNetwork =
+                        
DbFacade.getInstance().getNetworkDao().getByNameAndCluster(network.getName(), 
cluster.getId());
 
-                if (null != LinqUtils.firstOrNull(networks, new 
Predicate<Network>() {
-                    @Override
-                    public boolean eval(Network n) {
-                        return n.getname().equals(network.getname());
-                    }
-                })) {
+                if (removedNetwork != null) {
                     
canDoActionMessages.add(VdcBllMessages.NETWORK_CLUSTER_NETWORK_IN_USE.toString());
                     return false;
                 }


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

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