Alona Kaplan has uploaded a new change for review.
Change subject: engine: Adjust NetworkMonitoringHelper to accept any vlan
device nameengine: Adjust NetworkMonitoringHelper to accept any vlan device name
......................................................................
engine: Adjust NetworkMonitoringHelper to accept any vlan device nameengine:
Adjust NetworkMonitoringHelper to accept any vlan device name
Changes done in this patch-
1. Using iface.getBaseInterface() and iface.getVlanId() instead
of determining this values from the vlan device name (since its format is
no longer- baseIface.vlanId).
2. Using the new methods indroduced in NetworkUtils instead of
the old ones (that should be removed in a following patch).
Change-Id: I96c998b8575bc8d48ec482d725de3579f51a7c88
Signed-off-by: Alona Kaplan <alkap...@redhat.com>
---
M
backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/NetworkMonitoringHelper.java
1 file changed, 6 insertions(+), 27 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/51/27151/1
diff --git
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/NetworkMonitoringHelper.java
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/NetworkMonitoringHelper.java
index 196c855..40aac69 100644
---
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/NetworkMonitoringHelper.java
+++
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/NetworkMonitoringHelper.java
@@ -1,6 +1,5 @@
package org.ovirt.engine.core.vdsbroker;
-import org.apache.commons.lang.StringUtils;
import org.ovirt.engine.core.common.businessentities.network.InterfaceStatus;
import org.ovirt.engine.core.common.businessentities.network.Network;
import org.ovirt.engine.core.common.businessentities.network.NetworkStatus;
@@ -159,33 +158,19 @@
}
// check if vlan over bond i.e if we are in bond0.5 we look for bond0
- String name = NetworkUtils.getVlanInterfaceName(iface.getName());
- if (name == null) {
- return false;
- }
-
- for (VdsNetworkInterface i : interfaces) {
- if (name.equals(i.getName())) {
- return (i.getBonded() != null && i.getBonded() == true);
- }
- }
- return false;
- }
+ return NetworkUtils.isBondVlan(interfaces, iface);
+ }
// function check if vlan over bond connected to network
// i.e. if we have bond0 that have vlan #5 like:
// bond0 and bond0.5
- // bond0 is not connectet to network just the bond0.5 is connected to
network
+ // bond0 is not connected to network just the bond0.5 is connected to
network
// and this method check for that case
private static boolean isVlanOverBondNetwork(String bondName,
String networkName,
List<VdsNetworkInterface> interfaces) {
for (VdsNetworkInterface iface : interfaces) {
- String name = NetworkUtils.getVlanInterfaceName(iface.getName());
- // this if check if the interface is vlan
- if (name == null) {
- continue;
- } else if (name.equals(bondName)
+ if (NetworkUtils.isVlan(iface) &&
NetworkUtils.interfaceBasedOn(iface, bondName)
&& networkName.equals(iface.getNetworkName())) {
return true;
}
@@ -195,18 +180,12 @@
// If vlan we search if the interface is up (i.e. not eth2.5 we look for
eth2)
private static boolean isVlanInterfaceUp(VdsNetworkInterface vlan,
List<VdsNetworkInterface> interfaces) {
- String[] tokens = vlan.getName().split("[.]");
- if (tokens.length == 1) {
+ if (!NetworkUtils.isVlan(vlan)) {
// not vlan
return true;
}
- StringBuilder sb = new StringBuilder();
- for (int i = 0; i < tokens.length - 1; i++) {
- sb.append(tokens[i])
- .append(".");
- }
- String ifaceName = StringUtils.stripEnd(sb.toString(), ".");
+ String ifaceName = vlan.getBaseInterface();
for (VdsNetworkInterface iface : interfaces) {
if (iface.getName().equals(ifaceName)) {
return iface.getStatistics().getStatus() == InterfaceStatus.UP;
--
To view, visit http://gerrit.ovirt.org/27151
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I96c998b8575bc8d48ec482d725de3579f51a7c88
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Alona Kaplan <alkap...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
