[Engine-patches] Change in ovirt-engine[master]: engine: CanDoAction of Update/AddNetworkCommand

[msalem]

Muli Salem has uploaded a new change for review.

Change subject: engine: CanDoAction of Update/AddNetworkCommand
......................................................................

engine: CanDoAction of Update/AddNetworkCommand

This patch aggregates the if statements in the
canDoAction into a single statement.

Change-Id: Ifcf0f43957eddfd55261832729931579abbc3e8d
Signed-off-by: Muli Salem <msa...@redhat.com>
---
M 
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/dc/AddNetworkCommand.java
M 
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/dc/UpdateNetworkCommand.java
2 files changed, 17 insertions(+), 68 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/26/10626/1

diff --git 
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/dc/AddNetworkCommand.java
 
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/dc/AddNetworkCommand.java
index 6b6d585..7529680 100644
--- 
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/dc/AddNetworkCommand.java
+++ 
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/dc/AddNetworkCommand.java
@@ -40,33 +40,13 @@
 
     @Override
     protected boolean canDoAction() {
-        if (!validate(vmNetworkSetCorrectly())) {
-            return false;
-        }
-
-        if (!validate(stpForVmNetworkOnly())) {
-            return false;
-        }
-
-        if (!validate(mtuValid())) {
-            return false;
-        }
-
-        if (!validate(networkPrefixValid())) {
-            return false;
-        }
-
         List<Network> all = getNetworks();
-
-        if (!validate(networkDoesNotExist(all))) {
-            return false;
-        }
-
-        if (!validate(vlanIsFree(all))) {
-            return false;
-        }
-
-        return true;
+        return validate(vmNetworkSetCorrectly())
+                && validate(stpForVmNetworkOnly())
+                && validate(mtuValid())
+                && validate(networkPrefixValid())
+                && validate(networkDoesNotExist(all))
+                && validate(vlanIsFree(all));
     }
 
     @Override
diff --git 
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/dc/UpdateNetworkCommand.java
 
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/dc/UpdateNetworkCommand.java
index b94aab7..a65ec07 100644
--- 
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/dc/UpdateNetworkCommand.java
+++ 
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/dc/UpdateNetworkCommand.java
@@ -42,50 +42,19 @@
 
     @Override
     protected boolean canDoAction() {
-        if (!validate(storagePoolExists())) {
-            return false;
-        }
-
-        if (!validate(vmNetworkSetCorrectly())) {
-            return false;
-        }
-
-        if (!validate(stpForVmNetworkOnly())) {
-            return false;
-        }
-
-        if (!validate(mtuValid())) {
-            return false;
-        }
-
-        if (!validate(networkPrefixValid())) {
-            return false;
-        }
-
         List<Network> networks = getNetworkDAO().getAll();
-
-        if (!validate(vlanIsFree(networks))) {
-            return false;
-        }
-
         Network oldNetwork = getNetworkById(networks);
-        if (!validate(networkExists(oldNetwork))) {
-            return false;
-        }
-
-        if (!validate(notChangingManagementNetworkName(oldNetwork))) {
-            return false;
-        }
-
-        if (!validate(networkNameNotUsed(networks))) {
-            return false;
-        }
-
-        if (!validate(networkNotUsedByRunningVm())) {
-            return false;
-        }
-
-        return validate(networkNotAttachedToCluster(oldNetwork));
+        return validate(storagePoolExists())
+                && validate(vmNetworkSetCorrectly())
+                && validate(stpForVmNetworkOnly())
+                && validate(mtuValid())
+                && validate(networkPrefixValid())
+                && validate(vlanIsFree(networks))
+                && validate(networkExists(oldNetwork))
+                && validate(notChangingManagementNetworkName(oldNetwork))
+                && validate(networkNameNotUsed(networks))
+                && validate(networkNotUsedByRunningVm())
+                && validate(networkNotAttachedToCluster(oldNetwork));
     }
 
     @Override


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

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