Alona Kaplan has uploaded a new change for review.
Change subject: engine: Adjust NetworkUtils to accept any vlan device name -
phase 2
......................................................................
engine: Adjust NetworkUtils to accept any vlan device name - phase 2
This patch contains-
1. Removing from all the old methods assuming vlan device name format is
baseNic.vlanId from NetworkUtils.
2. Fixing NetworkUtilsTest.
The patch is the last one in a chain of patches.
The previous patches fixed all the places thats used the old methods.
Change-Id: I884ea51d4c7b47fef2b7fb2c89b4efd36701980c
Signed-off-by: Alona Kaplan <alkap...@redhat.com>
---
M
backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/NetworkUtils.java
M
backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/NetworkUtilsTest.java
2 files changed, 22 insertions(+), 75 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/53/27153/1
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 65b2333..315c4e2 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
@@ -15,7 +15,6 @@
import
org.ovirt.engine.core.common.businessentities.network.VdsNetworkInterface;
import org.ovirt.engine.core.common.config.Config;
import org.ovirt.engine.core.common.config.ConfigValues;
-import org.ovirt.engine.core.compat.IntegerCompat;
public final class NetworkUtils {
public static final String OS_REFERENCE_TO_MACHINE_NAME = "HOSTNAME";
@@ -24,59 +23,10 @@
return Config.<String> getValue(ConfigValues.ManagementNetwork);
}
- // TODO this method should be removed at the end of accept vlan devices
identified by any name
- // method return interface name without vlan:
- // input: eth0.5 output eth0
- // input" eth0 output eth0
- public static String stripVlan(String name) {
- String[] tokens = name.split("[.]", -1);
- if (tokens.length == 1) {
- return name;
- }
-
- StringBuilder sb = new StringBuilder();
- for (int i = 0; i < tokens.length - 1; i++) {
- sb.append(tokens[i]).append(".");
- }
- return StringUtils.stripEnd(sb.toString(), ".");
- }
-
// method returns underlying interface name:
// if the interface is not vlan returns the interface name
public static String stripVlan(VdsNetworkInterface nic) {
return NetworkUtils.isVlan(nic) ? nic.getBaseInterface() :
nic.getName();
- }
-
- // TODO this method should be removed at the end of accept vlan devices
identified by any name
- // method return interface name without vlan:
- // if the interface is not vlan it return null
- // input: eth0.5 returns eth0
- // input" eth0 returns null
- public static String getVlanInterfaceName(String name) {
- String[] tokens = name.split("[.]", -1);
- if (tokens.length == 1) {
- return null;
- }
-
- StringBuilder sb = new StringBuilder();
- for (int i = 0; i < tokens.length - 1; i++) {
- sb.append(tokens[i]).append(".");
- }
- return StringUtils.stripEnd(sb.toString(), ".");
- }
-
- // TODO this method should be removed at the end of accept vlan devices
identified by any name
- // method return the vlan part of the interface name (if exists),
- // else - return null
- public static Integer getVlanId(String ifaceName) {
- String[] tokens = ifaceName.split("[.]", -1);
- if (tokens.length > 1) {
- Integer vlan = IntegerCompat.tryParse(tokens[tokens.length - 1]);
- if (vlan != null) {
- return vlan;
- }
- }
- return null;
}
public static boolean isBondVlan(List<VdsNetworkInterface> interfaces,
VdsNetworkInterface iface) {
@@ -89,23 +39,6 @@
}
return false;
- }
-
- // TODO this method should be removed at the end of accept vlan devices
identified by any name
- /**
- * Check if the proposed interface name represents a VLAN of the given
interface name or is equal to it.<br>
- * If either of the parameters is null, <code>false</code> is returned.
- *
- * @param proposedIface
- * The interface to check if it's a VLAN of the other interface
or it is the other interface.
- * @param iface
- * The interface to check for.
- *
- * @return <code>true</code> if the proposed interface is a VLAN on the
interface or if it is the same name,
- * <code>false</code> otherwise.
- */
- public static boolean interfaceBasedOn(String proposedIface, String iface)
{
- return iface != null && proposedIface != null &&
iface.equals(stripVlan(proposedIface));
}
/**
diff --git
a/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/NetworkUtilsTest.java
b/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/NetworkUtilsTest.java
index d87a568..3a619b6 100644
---
a/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/NetworkUtilsTest.java
+++
b/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/NetworkUtilsTest.java
@@ -10,8 +10,10 @@
import org.junit.Test;
import org.ovirt.engine.core.common.businessentities.network.Network;
import org.ovirt.engine.core.common.businessentities.network.NetworkQoS;
+import org.ovirt.engine.core.common.businessentities.network.Nic;
import
org.ovirt.engine.core.common.businessentities.network.VdsNetworkInterface;
import
org.ovirt.engine.core.common.businessentities.network.VdsNetworkInterface.NetworkImplementationDetails;
+import org.ovirt.engine.core.common.businessentities.network.Vlan;
import org.ovirt.engine.core.common.config.ConfigValues;
public class NetworkUtilsTest {
@@ -203,32 +205,32 @@
@Test
public void interfaceBasedOn() {
- assertTrue(NetworkUtils.interfaceBasedOn(generateVlanName(IFACE_NAME),
IFACE_NAME));
+ assertTrue(NetworkUtils.interfaceBasedOn(createVlan(IFACE_NAME),
IFACE_NAME));
}
@Test
public void interfaceBasedOnSameName() {
- assertTrue(NetworkUtils.interfaceBasedOn(IFACE_NAME, IFACE_NAME));
+ assertTrue(NetworkUtils.interfaceBasedOn(createNic(IFACE_NAME),
IFACE_NAME));
}
@Test
public void interfaceBasedOnNotAVlanOfIface() {
- assertFalse(NetworkUtils.interfaceBasedOn(generateVlanName(IFACE_NAME
+ "1"), IFACE_NAME));
+ assertFalse(NetworkUtils.interfaceBasedOn(createVlan(IFACE_NAME +
"1"), IFACE_NAME));
}
@Test
public void interfaceBasedOnNotAVlanAtAll() {
- assertFalse(NetworkUtils.interfaceBasedOn(IFACE_NAME + "1",
IFACE_NAME));
+ assertFalse(NetworkUtils.interfaceBasedOn(createNic(IFACE_NAME + "1"),
IFACE_NAME));
}
@Test
public void interfaceBasedOnNullIface() {
-
assertFalse(NetworkUtils.interfaceBasedOn(generateVlanName(IFACE_NAME), null));
+ assertFalse(NetworkUtils.interfaceBasedOn(createVlan(IFACE_NAME),
null));
}
@Test
public void interfaceBasedOnNullProposedVlan() {
- assertFalse(NetworkUtils.interfaceBasedOn((String)null, IFACE_NAME));
+ assertFalse(NetworkUtils.interfaceBasedOn(null, IFACE_NAME));
}
@Test
@@ -262,8 +264,20 @@
assertFalse(NetworkUtils.isManagementNetwork(net));
}
- private String generateVlanName(String iface) {
- return iface + "." + RandomUtils.instance().nextInt(100);
+ private VdsNetworkInterface createVlan(String baseIfaceName) {
+ VdsNetworkInterface iface = new Vlan();
+ int vlanId = RandomUtils.instance().nextInt(100);
+
+ iface.setBaseInterface(baseIfaceName);
+ iface.setVlanId(vlanId);
+ iface.setName(baseIfaceName + "." + vlanId);
+ return iface;
+ }
+
+ private VdsNetworkInterface createNic(String ifaceName) {
+ VdsNetworkInterface iface = new Nic();
+ iface.setName(ifaceName);
+ return iface;
}
private void
calculateNetworkImplementationDetailsAndAssertManaged(VdsNetworkInterface iface,
--
To view, visit http://gerrit.ovirt.org/27153
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I884ea51d4c7b47fef2b7fb2c89b4efd36701980c
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
