Alona Kaplan has uploaded a new change for review. Change subject: engine: DetachNetworkFromVdsInterfaceCommand ......................................................................
engine: DetachNetworkFromVdsInterfaceCommand Change-Id: I95a20887f8359bab66ea54747d21e05c310fc21c Signed-off-by: Alona Kaplan <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/GetAllSiblingVlanInterfacesQuery.java 1 file changed, 15 insertions(+), 6 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/13/26613/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/GetAllSiblingVlanInterfacesQuery.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/GetAllSiblingVlanInterfacesQuery.java index a7936d9..cb00817 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/GetAllSiblingVlanInterfacesQuery.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/GetAllSiblingVlanInterfacesQuery.java @@ -8,6 +8,8 @@ import org.ovirt.engine.core.common.businessentities.network.VdsNetworkInterface; import org.ovirt.engine.core.common.queries.InterfaceAndIdQueryParameters; import org.ovirt.engine.core.utils.NetworkUtils; +import org.ovirt.engine.core.utils.linq.LinqUtils; +import org.ovirt.engine.core.utils.linq.Predicate; /** * This query get vlan interface and return all it's siblings, i.e input: eth2.2 @@ -22,15 +24,22 @@ @Override protected void executeQueryCommand() { ArrayList<VdsNetworkInterface> retVal = new ArrayList<VdsNetworkInterface>(); - if (NetworkUtils.isVlan(getParameters().getInterface())) { - List<VdsNetworkInterface> vdsInterfaces = - getDbFacade().getInterfaceDao().getAllInterfacesForVds(getParameters().getId()); + List<VdsNetworkInterface> vdsInterfaces = + getDbFacade().getInterfaceDao().getAllInterfacesForVds(getParameters().getId()); + VdsNetworkInterface iface = LinqUtils.firstOrNull(vdsInterfaces, new Predicate<VdsNetworkInterface>() { + @Override + public boolean eval(VdsNetworkInterface i) { + return i.getName().equals(getParameters().getInterface().getName()); + } + }); + + if (iface != null && NetworkUtils.isVlan(iface)) { for (int i = 0; i < vdsInterfaces.size(); i++) { if (NetworkUtils.isVlan(vdsInterfaces.get(i)) - && !StringUtils.equals(getParameters().getInterface().getName(), vdsInterfaces.get(i) + && !StringUtils.equals(iface.getName(), vdsInterfaces.get(i) .getName())) { - if (StringUtils.equals(NetworkUtils.stripVlan(getParameters().getInterface().getName()), - NetworkUtils.stripVlan(vdsInterfaces.get(i).getName()))) { + if (StringUtils.equals(iface.getBaseInterface(), + vdsInterfaces.get(i).getBaseInterface())) { retVal.add(vdsInterfaces.get(i)); } } -- To view, visit http://gerrit.ovirt.org/26613 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I95a20887f8359bab66ea54747d21e05c310fc21c 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
