Moti Asayag has uploaded a new change for review. Change subject: engine: Extract removeVnicProfiles() to NetworkCommon ......................................................................
engine: Extract removeVnicProfiles() to NetworkCommon The patch moves removeVnicProfiles() into network actions base class since it will will be used by other network commands. Change-Id: I28dc95fd1a20972c58b54f8ca5289e6a7138648f Signed-off-by: Moti Asayag <[email protected]> --- 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 2 files changed, 9 insertions(+), 5 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/86/16786/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 7d39444..38c7b70 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,6 +8,7 @@ import org.ovirt.engine.core.common.VdcObjectType; import org.ovirt.engine.core.common.action.AddNetworkStoragePoolParameters; import org.ovirt.engine.core.common.businessentities.network.Network; +import org.ovirt.engine.core.common.businessentities.network.VnicProfile; import org.ovirt.engine.core.common.errors.VdcBllMessages; import org.ovirt.engine.core.compat.Guid; @@ -25,6 +26,13 @@ return getNetwork().getName(); } + protected void removeVnicProfiles() { + List<VnicProfile> profiles = getVnicProfileDao().getAllForNetwork(getNetwork().getId()); + for (VnicProfile vnicProfile : profiles) { + getVnicProfileDao().remove(vnicProfile.getId()); + } + } + @Override protected void setActionMessageParameters() { addCanDoActionMessage(VdcBllMessages.VAR__TYPE__NETWORK); 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 b7d7ed0..93ca3af 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 @@ -12,7 +12,6 @@ import org.ovirt.engine.core.common.action.AddNetworkStoragePoolParameters; import org.ovirt.engine.core.common.businessentities.network.Network; import org.ovirt.engine.core.common.businessentities.network.NetworkCluster; -import org.ovirt.engine.core.common.businessentities.network.VnicProfile; import org.ovirt.engine.core.common.errors.VdcBllMessages; import org.ovirt.engine.core.common.validation.group.UpdateEntity; import org.ovirt.engine.core.dal.dbbroker.auditloghandling.AuditLogableBase; @@ -34,10 +33,7 @@ } if (networkChangedToNonVmNetwork()) { - List<VnicProfile> profiles = getVnicProfileDao().getAllForNetwork(getNetwork().getId()); - for (VnicProfile vnicProfile : profiles) { - getVnicProfileDao().remove(vnicProfile.getId()); - } + removeVnicProfiles(); } setSucceeded(true); -- To view, visit http://gerrit.ovirt.org/16786 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I28dc95fd1a20972c58b54f8ca5289e6a7138648f Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Moti Asayag <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
