Mike Kolesnik has uploaded a new change for review. Change subject: engine: Use same query for update network ......................................................................
engine: Use same query for update network Update network should use the same query as add since there is no need to query for all the networks in the system just the ones in the DC of the network. Change-Id: I2580d61101ff36fd1a623c8962be7eea4ebc3bdc Signed-off-by: Mike Kolesnik <[email protected]> --- 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, 5 insertions(+), 5 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/46/10646/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 c4c8311..e9bdd24 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 @@ -108,10 +108,6 @@ MultiLevelAdministrationHandler.addPermission(perms); } - private List<Network> getNetworks() { - return getNetworkDAO().getAllForDataCenter(getNetwork().getDataCenterId()); - } - private ValidationResult networkDoesNotExist(List<Network> networks) { return getNetworkByName(networks) == null ? ValidationResult.VALID 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 e356034..d775aa9 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 @@ -97,4 +97,8 @@ VdcObjectType.Network, getActionType().getActionGroup())); } + + protected List<Network> getNetworks() { + return getNetworkDAO().getAllForDataCenter(getNetwork().getDataCenterId()); + } } 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 d418df5..288098c 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 @@ -62,7 +62,7 @@ return false; } - List<Network> networks = getNetworkDAO().getAll(); + List<Network> networks = getNetworks(); if (!validate(vlanIsFree(networks))) { return false; -- To view, visit http://gerrit.ovirt.org/10646 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I2580d61101ff36fd1a623c8962be7eea4ebc3bdc 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
