Mike Kolesnik has uploaded a new change for review. Change subject: engine: Replace validation by simpler one ......................................................................
engine: Replace validation by simpler one The validation needs to check that network is not attached to a cluster. This is simple enough to check by querying the NetworkCluster entity to see it there exists any connection from this network to a cluster. Change-Id: I02f78a56f367d738bd16c6c4b143a21893606628 Signed-off-by: Mike Kolesnik <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/dc/NetworkCommon.java 1 file changed, 4 insertions(+), 12 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/70/10470/1 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 69c3271..8fbdc32 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 @@ -8,7 +8,6 @@ import org.ovirt.engine.core.common.VdcObjectType; import org.ovirt.engine.core.common.action.AddNetworkStoragePoolParameters; import org.ovirt.engine.core.common.businessentities.Network; -import org.ovirt.engine.core.common.businessentities.VDSGroup; import org.ovirt.engine.core.common.config.Config; import org.ovirt.engine.core.common.config.ConfigValues; import org.ovirt.engine.core.compat.Guid; @@ -94,18 +93,11 @@ } protected boolean networkNotAttachedToCluster(final Network network) { - if (network.getstorage_pool_id() != null) { - List<VDSGroup> clusters = getVdsGroupDAO().getAllForStoragePool( - network.getstorage_pool_id().getValue()); - for (VDSGroup cluster : clusters) { - Network attachedNetwork = getNetworkDAO().getByNameAndCluster(network.getName(), cluster.getId()); - - if (attachedNetwork != null) { - addCanDoActionMessage(VdcBllMessages.NETWORK_CLUSTER_NETWORK_IN_USE); - return false; - } - } + if (!getNetworkClusterDAO().getAllForNetwork(network.getId()).isEmpty()) { + addCanDoActionMessage(VdcBllMessages.NETWORK_CLUSTER_NETWORK_IN_USE); + return false; } + return true; } -- To view, visit http://gerrit.ovirt.org/10470 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I02f78a56f367d738bd16c6c4b143a21893606628 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Mike Kolesnik <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
