Moti Asayag has uploaded a new change for review. Change subject: engine: Remove vnic profiles for non-vm network ......................................................................
engine: Remove vnic profiles for non-vm network When a network is being changed from vm network to non-vm network, all of its vnic-profiles whould be removed, as no vms are allowed for that network. The permissions of the vnic profiles will be deleted as well. Change-Id: Ife353a6824502c6aff47814368455aaddb0a2bac Signed-off-by: Moti Asayag <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/dc/UpdateNetworkCommand.java 1 file changed, 13 insertions(+), 0 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/85/16785/1 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 e4c7d09..b7d7ed0 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,6 +12,7 @@ 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; @@ -31,9 +32,21 @@ for (NetworkCluster clusterAttachment : getNetworkClusterDAO().getAllForNetwork(getNetwork().getId())) { NetworkClusterHelper.setStatus(clusterAttachment.getClusterId(), getNetwork()); } + + if (networkChangedToNonVmNetwork()) { + List<VnicProfile> profiles = getVnicProfileDao().getAllForNetwork(getNetwork().getId()); + for (VnicProfile vnicProfile : profiles) { + getVnicProfileDao().remove(vnicProfile.getId()); + } + } + setSucceeded(true); } + private boolean networkChangedToNonVmNetwork() { + return getOldNetwork().isVmNetwork() && !getNetwork().isVmNetwork(); + } + @Override protected void setActionMessageParameters() { super.setActionMessageParameters(); -- To view, visit http://gerrit.ovirt.org/16785 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ife353a6824502c6aff47814368455aaddb0a2bac 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
