Moti Asayag has uploaded a new change for review. Change subject: engine: Add NetworkUtils.isVlan(VdsNetworkInterface) ......................................................................
engine: Add NetworkUtils.isVlan(VdsNetworkInterface) Since the logic of indicating if a nic is a vlan device is repeated all over, it is extracted into a utility method. Change-Id: I05d1f711f2d0ee63b94914f2e133c1c0b7d4bac9 Signed-off-by: Moti Asayag <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MigrateVmCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/GetAllChildVlanInterfacesQuery.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/GetAllSiblingVlanInterfacesQuery.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/GetVlanParentQuery.java M backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/NetworkUtils.java 5 files changed, 19 insertions(+), 8 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/86/22786/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MigrateVmCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MigrateVmCommand.java index 1452c03..ee07419 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MigrateVmCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MigrateVmCommand.java @@ -227,7 +227,7 @@ } protected boolean migrationInterfaceUp(VdsNetworkInterface nic, List<VdsNetworkInterface> nics) { - if (nic.getVlanId() != null) { + if (NetworkUtils.isVlan(nic)) { String physicalNic = NetworkUtils.stripVlan(nic.getName()); for (VdsNetworkInterface iface : nics) { if (iface.getName().equals(physicalNic)) { diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/GetAllChildVlanInterfacesQuery.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/GetAllChildVlanInterfacesQuery.java index 8ce9962..7778302 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/GetAllChildVlanInterfacesQuery.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/GetAllChildVlanInterfacesQuery.java @@ -20,11 +20,11 @@ @Override protected void executeQueryCommand() { java.util.ArrayList<VdsNetworkInterface> retVal = new java.util.ArrayList<VdsNetworkInterface>(); - if ((getParameters().getInterface()).getVlanId() == null) { + if (!NetworkUtils.isVlan(getParameters().getInterface())) { List<VdsNetworkInterface> vdsInterfaces = getDbFacade().getInterfaceDao().getAllInterfacesForVds(getParameters().getId()); for (int i = 0; i < vdsInterfaces.size(); i++) { - if (vdsInterfaces.get(i).getVlanId() != null) { + if (NetworkUtils.isVlan(vdsInterfaces.get(i))) { 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/network/host/GetAllSiblingVlanInterfacesQuery.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/GetAllSiblingVlanInterfacesQuery.java index b394458..137cfce 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 @@ -21,11 +21,11 @@ @Override protected void executeQueryCommand() { java.util.ArrayList<VdsNetworkInterface> retVal = new java.util.ArrayList<VdsNetworkInterface>(); - if ((getParameters().getInterface()).getVlanId() != null) { + if (NetworkUtils.isVlan(getParameters().getInterface())) { List<VdsNetworkInterface> vdsInterfaces = getDbFacade().getInterfaceDao().getAllInterfacesForVds(getParameters().getId()); for (int i = 0; i < vdsInterfaces.size(); i++) { - if (vdsInterfaces.get(i).getVlanId() != null + if (NetworkUtils.isVlan(vdsInterfaces.get(i)) && !StringUtils.equals(getParameters().getInterface().getName(), vdsInterfaces.get(i) .getName())) { if (StringUtils.equals(NetworkUtils.stripVlan(getParameters().getInterface().getName()), diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/GetVlanParentQuery.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/GetVlanParentQuery.java index 3e99e4a..c6e8f90 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/GetVlanParentQuery.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/GetVlanParentQuery.java @@ -17,7 +17,7 @@ @Override protected void executeQueryCommand() { - if ((getParameters().getInterface()).getVlanId() != null) { + if (NetworkUtils.isVlan(getParameters().getInterface())) { List<VdsNetworkInterface> vdsInterfaces = getDbFacade().getInterfaceDao().getAllInterfacesForVds(getParameters().getId()); for (int i = 0; i < vdsInterfaces.size(); i++) { 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 b8360f8..c4d881a 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 @@ -71,7 +71,7 @@ public static boolean isBondVlan(List<VdsNetworkInterface> interfaces, VdsNetworkInterface iface) { boolean retVal = false; - if (iface.getVlanId() != null) { + if (isVlan(iface)) { for (VdsNetworkInterface i : interfaces) { if (i.getBonded() != null && i.getBonded() == true && interfaceBasedOn(iface.getName(), i.getName())) { @@ -102,7 +102,7 @@ public static boolean interfaceHasVlan(VdsNetworkInterface iface, List<VdsNetworkInterface> allIfaces) { for (VdsNetworkInterface i : allIfaces) { - if (i.getVlanId() != null && interfaceBasedOn(i.getName(), iface.getName())) { + if (isVlan(i) && interfaceBasedOn(i.getName(), iface.getName())) { return true; } } @@ -215,4 +215,15 @@ public static boolean isVlan(Network network) { return network.getVlanId() != null; } + + /** + * Determine if a given network interface is a vlan device + * + * @param nic + * the nic to check. + * @return <code>true</code> iff the nic is a vlan. + */ + public static boolean isVlan(VdsNetworkInterface nic) { + return nic.getVlanId() != null; + } } -- To view, visit http://gerrit.ovirt.org/22786 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I05d1f711f2d0ee63b94914f2e133c1c0b7d4bac9 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Moti Asayag <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
