Mike Kolesnik has uploaded a new change for review. Change subject: engine: Use interfaceBasedOn where appropriate (#849971) ......................................................................
engine: Use interfaceBasedOn where appropriate (#849971) https://bugzilla.redhat.com/849971 Use the new interfaceBasedOn method where it is appropriate. Change-Id: I5698cf5e76aaac20e84f4283165d13406b1f981c Signed-off-by: Mike Kolesnik <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetAllChildVlanInterfacesQuery.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetVlanParanetQuery.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveBondCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateNetworkToVdsInterfaceCommand.java M backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/NetworkUtils.java 5 files changed, 7 insertions(+), 12 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/07/7407/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetAllChildVlanInterfacesQuery.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetAllChildVlanInterfacesQuery.java index dddf81e..59ab5ce 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetAllChildVlanInterfacesQuery.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetAllChildVlanInterfacesQuery.java @@ -4,7 +4,6 @@ import org.ovirt.engine.core.common.businessentities.VdsNetworkInterface; import org.ovirt.engine.core.common.queries.GetAllChildVlanInterfacesQueryParameters; -import org.ovirt.engine.core.compat.StringHelper; import org.ovirt.engine.core.utils.NetworkUtils; /** @@ -25,8 +24,8 @@ getDbFacade().getInterfaceDAO().getAllInterfacesForVds(getParameters().getVdsId()); for (int i = 0; i < vdsInterfaces.size(); i++) { if (vdsInterfaces.get(i).getVlanId() != null) { - if (StringHelper.EqOp(getParameters().getInterface().getName(), - NetworkUtils.StripVlan(vdsInterfaces.get(i).getName()))) { + if (NetworkUtils.interfaceBasedOn(vdsInterfaces.get(i).getName(), + getParameters().getInterface().getName())) { retVal.add(vdsInterfaces.get(i)); } } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetVlanParanetQuery.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetVlanParanetQuery.java index 9e42b41..83e49ea 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetVlanParanetQuery.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetVlanParanetQuery.java @@ -4,7 +4,6 @@ import org.ovirt.engine.core.common.businessentities.VdsNetworkInterface; import org.ovirt.engine.core.common.queries.GetAllChildVlanInterfacesQueryParameters; -import org.ovirt.engine.core.compat.StringHelper; import org.ovirt.engine.core.dal.dbbroker.DbFacade; import org.ovirt.engine.core.utils.NetworkUtils; @@ -22,7 +21,7 @@ List<VdsNetworkInterface> vdsInterfaces = DbFacade.getInstance() .getInterfaceDAO().getAllInterfacesForVds(getParameters().getVdsId()); for (int i = 0; i < vdsInterfaces.size(); i++) { - if (StringHelper.EqOp(NetworkUtils.StripVlan(getParameters().getInterface().getName()), + if (NetworkUtils.interfaceBasedOn(getParameters().getInterface().getName(), vdsInterfaces.get(i).getName())) { getQueryReturnValue().setReturnValue(vdsInterfaces.get(i)); break; diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveBondCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveBondCommand.java index 9475d3b..77e8380 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveBondCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveBondCommand.java @@ -116,10 +116,7 @@ vdsInterfaces = LinqUtils.filter(vdsInterfaces, new Predicate<VdsNetworkInterface>() { @Override public boolean eval(VdsNetworkInterface i) { - if (i.getBondName() != null) { - return i.getBondName().equals(NetworkUtils.StripVlan(bond.getName())); - } - return false; + return NetworkUtils.interfaceBasedOn(bond.getName(), i.getBondName()); } }); _interfaces = new ArrayList<String>(); diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateNetworkToVdsInterfaceCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateNetworkToVdsInterfaceCommand.java index 214f671..27cb297 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateNetworkToVdsInterfaceCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateNetworkToVdsInterfaceCommand.java @@ -53,7 +53,7 @@ if (i.getBonded() != null && i.getBonded() || NetworkUtils.IsBondVlan(interfaces, i)) { getParameters().setBondName(NetworkUtils.StripVlan(i.getName())); for (VdsNetworkInterface ix : interfaces) { - if (StringUtils.equals(ix.getBondName(), NetworkUtils.StripVlan(i.getName()))) { + if (NetworkUtils.interfaceBasedOn(i.getName(), ix.getBondName())) { interfaceNames.add(NetworkUtils.StripVlan(ix.getName())); } } diff --git a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/NetworkUtils.java b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/NetworkUtils.java index a4e3ace..2dac1ce 100644 --- a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/NetworkUtils.java +++ b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/NetworkUtils.java @@ -77,7 +77,7 @@ if (iface.getVlanId() != null) { for (VdsNetworkInterface i : interfaces) { if (i.getBonded() != null && i.getBonded() == true - && StringHelper.EqOp(i.getName(), StripVlan(iface.getName()))) { + && interfaceBasedOn(iface.getName(), i.getName())) { retVal = true; break; } @@ -105,7 +105,7 @@ public static boolean interfaceHasVlan(VdsNetworkInterface iface, List<VdsNetworkInterface> allIfaces) { for (VdsNetworkInterface i : allIfaces) { - if (i.getVlanId() != null && NetworkUtils.StripVlan(i.getName()).equals(iface.getName())) { + if (i.getVlanId() != null && interfaceBasedOn(i.getName(), iface.getName())) { return true; } } -- To view, visit http://gerrit.ovirt.org/7407 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I5698cf5e76aaac20e84f4283165d13406b1f981c Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Mike Kolesnik <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
