Alona Kaplan has uploaded a new change for review. Change subject: engine: UpdateNetworkToVdsInterfaceCommand ......................................................................
engine: UpdateNetworkToVdsInterfaceCommand Change-Id: I8f003a2889ca429b6158889bc2f3335d111c9192 Signed-off-by: Alona Kaplan <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/UpdateNetworkToVdsInterfaceCommand.java 1 file changed, 8 insertions(+), 5 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/17/26617/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/UpdateNetworkToVdsInterfaceCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/UpdateNetworkToVdsInterfaceCommand.java index 1d25d3c..d19fec1 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/UpdateNetworkToVdsInterfaceCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/UpdateNetworkToVdsInterfaceCommand.java @@ -2,6 +2,7 @@ import java.util.ArrayList; import java.util.List; +import java.util.Map; import org.apache.commons.lang.StringUtils; import org.ovirt.engine.core.bll.Backend; @@ -50,16 +51,18 @@ String gateway = StringUtils.isEmpty(getParameters().getGateway()) ? "" : getParameters().getGateway(); ArrayList<String> interfaceNames = new ArrayList<String>(); + Map<String, VdsNetworkInterface> interfaceByName = Entities.entitiesByName(interfaces); for (VdsNetworkInterface i : getParameters().getInterfaces()) { - if (Boolean.TRUE.equals(i.getBonded()) || NetworkUtils.isBondVlan(interfaces, i)) { - getParameters().setBondName(NetworkUtils.stripVlan(i.getName())); + VdsNetworkInterface existingIface = interfaceByName.get(i.getName()) ; + if (Boolean.TRUE.equals(existingIface.getBonded()) || NetworkUtils.isBondVlan(interfaces, existingIface)) { + getParameters().setBondName(NetworkUtils.stripVlan(existingIface)); for (VdsNetworkInterface ix : interfaces) { - if (NetworkUtils.interfaceBasedOn(i.getName(), ix.getBondName())) { - interfaceNames.add(NetworkUtils.stripVlan(ix.getName())); + if (NetworkUtils.interfaceBasedOn(existingIface, ix.getBondName())) { + interfaceNames.add(NetworkUtils.stripVlan(ix)); } } } else { - interfaceNames.add(NetworkUtils.stripVlan(i.getName())); + interfaceNames.add(NetworkUtils.stripVlan(existingIface)); } } -- To view, visit http://gerrit.ovirt.org/26617 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8f003a2889ca429b6158889bc2f3335d111c9192 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Alona Kaplan <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
