Alona Kaplan has uploaded a new change for review. Change subject: engine: DetachNetworkFromVdsInterfaceCommand ......................................................................
engine: DetachNetworkFromVdsInterfaceCommand Change-Id: I2c90bbbc1b3d6bd8df87c83301956556d1c6eafd Signed-off-by: Alona Kaplan <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/DetachNetworkFromVdsInterfaceCommand.java 1 file changed, 13 insertions(+), 12 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/11/26611/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/DetachNetworkFromVdsInterfaceCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/DetachNetworkFromVdsInterfaceCommand.java index 7d3e854..f3d2ae8 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/DetachNetworkFromVdsInterfaceCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/DetachNetworkFromVdsInterfaceCommand.java @@ -24,6 +24,9 @@ import org.ovirt.engine.core.utils.linq.Predicate; public class DetachNetworkFromVdsInterfaceCommand<T extends AttachNetworkToVdsParameters> extends VdsNetworkCommand<T> { + + private VdsNetworkInterface iface; + public DetachNetworkFromVdsInterfaceCommand(T paramenters) { super(paramenters); } @@ -32,27 +35,25 @@ protected void executeCommand() { String bond = null; List<String> nics = new ArrayList<>(); - nics.add(NetworkUtils.stripVlan(getParameters().getInterface().getName())); - Integer vlanId = NetworkUtils.getVlanId(getParameters().getInterface().getName()); + String baseNicName = NetworkUtils.stripVlan(iface); + nics.add(baseNicName); + Integer vlanId = iface.getVlanId(); + List<VdsNetworkInterface> interfaces = getDbFacade() + .getInterfaceDao().getAllInterfacesForVds(getParameters().getVdsId()); // vlan with bond - boolean isBond = getParameters().getInterface().getName().startsWith("bond") - && getParameters().getInterface().getName().contains("."); + boolean isBond = NetworkUtils.isBondVlan(interfaces, iface); // or just a bond... - isBond = isBond - || (getParameters().getInterface().getBonded() != null && getParameters().getInterface().getBonded()); + isBond = isBond || (iface.getBonded() != null && iface.getBonded()); // check if bond... if (isBond) { nics.clear(); - bond = NetworkUtils.stripVlan(getParameters().getInterface().getName()); - - List<VdsNetworkInterface> interfaces = getDbFacade() - .getInterfaceDao().getAllInterfacesForVds(getParameters().getVdsId()); + bond = baseNicName; for (VdsNetworkInterface i : interfaces) { if (StringUtils.equals(i.getBondName(), bond)) { - nics.add(NetworkUtils.stripVlan(i.getName())); + nics.add(NetworkUtils.stripVlan(i)); } } } @@ -82,7 +83,7 @@ protected boolean canDoAction() { List<VdsNetworkInterface> interfaces = getDbFacade().getInterfaceDao() .getAllInterfacesForVds(getParameters().getVdsId()); - VdsNetworkInterface iface = LinqUtils.firstOrNull(interfaces, new Predicate<VdsNetworkInterface>() { + iface = LinqUtils.firstOrNull(interfaces, new Predicate<VdsNetworkInterface>() { @Override public boolean eval(VdsNetworkInterface i) { return i.getName().equals(getParameters().getInterface().getName()); -- To view, visit http://gerrit.ovirt.org/26611 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I2c90bbbc1b3d6bd8df87c83301956556d1c6eafd 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
