Mike Kolesnik has uploaded a new change for review.
Change subject: engine: Refactor validateVlanId method
......................................................................
engine: Refactor validateVlanId method
Refactor method to use iteration, which makes it easier to read, and
also changed the name to a more suitable one.
Change-Id: I5d12da6142b5195e7838a8b89690da6bf6e3fea5
Signed-off-by: Mike Kolesnik <mkole...@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/NetworkCommon.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/dc/UpdateNetworkCommand.java
3 files changed, 15 insertions(+), 20 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/84/10484/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 a539d39..7ab751a 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
@@ -80,7 +80,7 @@
return false;
}
- if (!validateVlanId(all)) {
+ if (!vlanIsFree(all)) {
return false;
}
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/dc/NetworkCommon.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/dc/NetworkCommon.java
index 613dbf3..cd527a4 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/dc/NetworkCommon.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/dc/NetworkCommon.java
@@ -15,8 +15,6 @@
import org.ovirt.engine.core.dal.VdcBllMessages;
import org.ovirt.engine.core.dal.dbbroker.auditloghandling.CustomLogField;
import org.ovirt.engine.core.dal.dbbroker.auditloghandling.CustomLogFields;
-import org.ovirt.engine.core.utils.linq.LinqUtils;
-import org.ovirt.engine.core.utils.linq.Predicate;
@SuppressWarnings("serial")
@CustomLogFields({ @CustomLogField("NetworkName") })
@@ -76,23 +74,20 @@
return mtuSupported;
}
- protected boolean validateVlanId(List<Network> networks) {
- if (getNetwork().getvlan_id() != null
- && null != LinqUtils.firstOrNull(networks, new
Predicate<Network>() {
- @Override
- public boolean eval(Network n) {
- if (n.getvlan_id() != null) {
- return
n.getvlan_id().equals(getNetwork().getvlan_id())
- &&
n.getstorage_pool_id().equals(getNetwork().getstorage_pool_id())
- && !n.getId().equals(getNetwork().getId());
- }
- return false;
- }
- })) {
- addCanDoActionMessage(String.format("$vlanId %d",
getNetwork().getvlan_id()));
- addCanDoActionMessage(VdcBllMessages.NETWORK_VLAN_IN_USE);
- return false;
+ protected boolean vlanIsFree(List<Network> networks) {
+ if (getNetwork().getvlan_id() != null) {
+ for (Network network : networks) {
+ if (network.getvlan_id() != null
+ &&
network.getvlan_id().equals(getNetwork().getvlan_id())
+ &&
network.getstorage_pool_id().equals(getNetwork().getstorage_pool_id())
+ && !network.getId().equals(getNetwork().getId())) {
+ addCanDoActionMessage(String.format("$vlanId %d",
getNetwork().getvlan_id()));
+ addCanDoActionMessage(VdcBllMessages.NETWORK_VLAN_IN_USE);
+ return false;
+ }
+ }
}
+
return true;
}
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 c44956a..bd43b38 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
@@ -67,7 +67,7 @@
return false;
}
- if (!validateVlanId(networks)) {
+ if (!vlanIsFree(networks)) {
return false;
}
--
To view, visit http://gerrit.ovirt.org/10484
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I5d12da6142b5195e7838a8b89690da6bf6e3fea5
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Mike Kolesnik <mkole...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
