Lior Vernia has uploaded a new change for review. Change subject: engine: Don't resurrect removed bonds for label ......................................................................
engine: Don't resurrect removed bonds for label If a network was attached via label to a bond being removed, the operation would still be blocked by the CanDoAction, this is now fixed. Change-Id: Ie5c0648999a80c313f6565673e7880a2b34f3e53 Bug-Url: https://bugzilla.redhat.com/1084771 Bug-Url: https://bugzilla.redhat.com/1084915 Signed-off-by: Lior Vernia <lver...@redhat.com> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/SetupNetworksHelper.java 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/89/26889/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/SetupNetworksHelper.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/SetupNetworksHelper.java index d644bed..5e7605b 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/SetupNetworksHelper.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/SetupNetworksHelper.java @@ -112,7 +112,7 @@ for (String network : removedNetworks) { VdsNetworkInterface nic = hostInterfacesByNetworkName.get(network); - if (nic != null) { + if (nic != null && !removedBonds.contains(nic.getName())) { if (NetworkUtils.isVlan(nic)) { nic = nicsByName.get(NetworkUtils.stripVlan(nic.getName())); if (nic == null) { -- To view, visit http://gerrit.ovirt.org/26889 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie5c0648999a80c313f6565673e7880a2b34f3e53 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Lior Vernia <lver...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
