renamed IpAddress to IpPrefix
Change-Id: I35990622e5b1c29ab6f6a0a0227088cd5d6c7294
diff --git a/utils/misc/src/main/java/org/onlab/packet/IpAddress.java b/utils/misc/src/main/java/org/onlab/packet/IpPrefix.java
similarity index 85%
rename from utils/misc/src/main/java/org/onlab/packet/IpAddress.java
rename to utils/misc/src/main/java/org/onlab/packet/IpPrefix.java
index 73bb9c9..c73bf9a 100644
--- a/utils/misc/src/main/java/org/onlab/packet/IpAddress.java
+++ b/utils/misc/src/main/java/org/onlab/packet/IpPrefix.java
@@ -5,7 +5,7 @@
/**
* A class representing an IPv4 address.
*/
-public final class IpAddress {
+public final class IpPrefix {
// TODO a comparator for netmasks? E.g. for sorting by prefix match order.
@@ -31,13 +31,13 @@
protected byte[] octets;
protected int netmask;
- private IpAddress(Version ver, byte[] octets, int netmask) {
+ private IpPrefix(Version ver, byte[] octets, int netmask) {
this.version = ver;
this.octets = Arrays.copyOf(octets, INET_LEN);
this.netmask = netmask;
}
- private IpAddress(Version ver, byte[] octets) {
+ private IpPrefix(Version ver, byte[] octets) {
this.version = ver;
this.octets = Arrays.copyOf(octets, INET_LEN);
this.netmask = DEFAULT_MASK;
@@ -49,8 +49,8 @@
* @param address a byte array
* @return an IP address
*/
- public static IpAddress valueOf(byte [] address) {
- return new IpAddress(Version.INET, address);
+ public static IpPrefix valueOf(byte [] address) {
+ return new IpPrefix(Version.INET, address);
}
/**
@@ -60,8 +60,8 @@
* @param netmask the CIDR value subnet mask
* @return an IP address
*/
- public static IpAddress valueOf(byte [] address, int netmask) {
- return new IpAddress(Version.INET, address, netmask);
+ public static IpPrefix valueOf(byte [] address, int netmask) {
+ return new IpPrefix(Version.INET, address, netmask);
}
/**
@@ -85,8 +85,8 @@
* @param address an integer representing an IP value
* @return an IP address
*/
- public static IpAddress valueOf(int address) {
- return new IpAddress(Version.INET, bytes(address));
+ public static IpPrefix valueOf(int address) {
+ return new IpPrefix(Version.INET, bytes(address));
}
/**
@@ -96,8 +96,8 @@
* @param netmask the CIDR value subnet mask
* @return an IP address
*/
- public static IpAddress valueOf(int address, int netmask) {
- return new IpAddress(Version.INET, bytes(address), netmask);
+ public static IpPrefix valueOf(int address, int netmask) {
+ return new IpPrefix(Version.INET, bytes(address), netmask);
}
/**
@@ -108,7 +108,7 @@
* @param address a IP address in string form, e.g. "10.0.0.1", "10.0.0.1/24"
* @return an IP address
*/
- public static IpAddress valueOf(String address) {
+ public static IpPrefix valueOf(String address) {
final String [] parts = address.split("\\/");
if (parts.length > 2) {
@@ -135,7 +135,7 @@
for (int i = 0; i < INET_LEN; i++) {
bytes[i] = (byte) Short.parseShort(net[i], 10);
}
- return new IpAddress(Version.INET, bytes, mask);
+ return new IpPrefix(Version.INET, bytes, mask);
}
/**
@@ -185,8 +185,8 @@
*
* @return the subnet mask
*/
- public IpAddress netmask() {
- return new IpAddress(Version.INET, bytes(mask()));
+ public IpPrefix netmask() {
+ return new IpPrefix(Version.INET, bytes(mask()));
}
/**
@@ -196,9 +196,9 @@
*
* @return the network address or null
*/
- public IpAddress network() {
+ public IpPrefix network() {
if (netmask == DEFAULT_MASK) {
- return new IpAddress(version, ANY, DEFAULT_MASK);
+ return new IpPrefix(version, ANY, DEFAULT_MASK);
}
byte [] net = new byte [4];
@@ -206,7 +206,7 @@
for (int i = 0; i < INET_LEN; i++) {
net[i] = (byte) (octets[i] & mask[i]);
}
- return new IpAddress(version, net, netmask);
+ return new IpPrefix(version, net, netmask);
}
/**
@@ -217,9 +217,9 @@
*
* @return the host address
*/
- public IpAddress host() {
+ public IpPrefix host() {
if (netmask == DEFAULT_MASK) {
- new IpAddress(version, octets, netmask);
+ new IpPrefix(version, octets, netmask);
}
byte [] host = new byte [INET_LEN];
@@ -227,7 +227,7 @@
for (int i = 0; i < INET_LEN; i++) {
host[i] = (byte) (octets[i] & ~mask[i]);
}
- return new IpAddress(version, host, netmask);
+ return new IpPrefix(version, host, netmask);
}
public boolean isMasked() {
@@ -242,7 +242,7 @@
* @return true if the other IP address is contained in this address'
* network, otherwise false
*/
- public boolean contains(IpAddress other) {
+ public boolean contains(IpPrefix other) {
if (this.netmask <= other.netmask) {
// Special case where they're both /32 addresses
if (this.netmask == MAX_INET_MASK) {
@@ -250,8 +250,8 @@
}
// Mask the other address with our network mask
- IpAddress otherMasked =
- IpAddress.valueOf(other.octets, netmask).network();
+ IpPrefix otherMasked =
+ IpPrefix.valueOf(other.octets, netmask).network();
return network().equals(otherMasked);
}
@@ -279,7 +279,7 @@
if (getClass() != obj.getClass()) {
return false;
}
- IpAddress other = (IpAddress) obj;
+ IpPrefix other = (IpPrefix) obj;
if (netmask != other.netmask) {
return false;
}
diff --git a/utils/misc/src/test/java/org/onlab/packet/IPAddressTest.java b/utils/misc/src/test/java/org/onlab/packet/IpPrefixTest.java
similarity index 65%
rename from utils/misc/src/test/java/org/onlab/packet/IPAddressTest.java
rename to utils/misc/src/test/java/org/onlab/packet/IpPrefixTest.java
index d503229..f6bf6f1 100644
--- a/utils/misc/src/test/java/org/onlab/packet/IPAddressTest.java
+++ b/utils/misc/src/test/java/org/onlab/packet/IpPrefixTest.java
@@ -7,11 +7,11 @@
import java.util.Arrays;
import org.junit.Test;
-import org.onlab.packet.IpAddress.Version;
+import org.onlab.packet.IpPrefix.Version;
import com.google.common.testing.EqualsTester;
-public class IPAddressTest {
+public class IpPrefixTest {
private static final byte [] BYTES1 = new byte [] {0xa, 0x0, 0x0, 0xa};
private static final byte [] BYTES2 = new byte [] {0xa, 0x0, 0x0, 0xb};
@@ -22,11 +22,11 @@
@Test
public void testEquality() {
- IpAddress ip1 = IpAddress.valueOf(BYTES1);
- IpAddress ip2 = IpAddress.valueOf(INTVAL1);
- IpAddress ip3 = IpAddress.valueOf(BYTES2);
- IpAddress ip4 = IpAddress.valueOf(INTVAL2);
- IpAddress ip5 = IpAddress.valueOf(STRVAL);
+ IpPrefix ip1 = IpPrefix.valueOf(BYTES1);
+ IpPrefix ip2 = IpPrefix.valueOf(INTVAL1);
+ IpPrefix ip3 = IpPrefix.valueOf(BYTES2);
+ IpPrefix ip4 = IpPrefix.valueOf(INTVAL2);
+ IpPrefix ip5 = IpPrefix.valueOf(STRVAL);
new EqualsTester().addEqualityGroup(ip1, ip2)
.addEqualityGroup(ip3, ip4)
@@ -34,16 +34,16 @@
.testEquals();
// string conversions
- IpAddress ip6 = IpAddress.valueOf(BYTES1, MASK);
- IpAddress ip7 = IpAddress.valueOf("10.0.0.10/16");
- IpAddress ip8 = IpAddress.valueOf(new byte [] {0xa, 0x0, 0x0, 0xc});
+ IpPrefix ip6 = IpPrefix.valueOf(BYTES1, MASK);
+ IpPrefix ip7 = IpPrefix.valueOf("10.0.0.10/16");
+ IpPrefix ip8 = IpPrefix.valueOf(new byte [] {0xa, 0x0, 0x0, 0xc});
assertEquals("incorrect address conversion", ip6, ip7);
assertEquals("incorrect address conversion", ip5, ip8);
}
@Test
public void basics() {
- IpAddress ip1 = IpAddress.valueOf(BYTES1, MASK);
+ IpPrefix ip1 = IpPrefix.valueOf(BYTES1, MASK);
final byte [] bytes = new byte [] {0xa, 0x0, 0x0, 0xa};
//check fields
@@ -57,29 +57,29 @@
@Test
public void netmasks() {
// masked
- IpAddress ip1 = IpAddress.valueOf(BYTES1, MASK);
+ IpPrefix ip1 = IpPrefix.valueOf(BYTES1, MASK);
- IpAddress host = IpAddress.valueOf("0.0.0.10/16");
- IpAddress network = IpAddress.valueOf("10.0.0.0/16");
+ IpPrefix host = IpPrefix.valueOf("0.0.0.10/16");
+ IpPrefix network = IpPrefix.valueOf("10.0.0.0/16");
assertEquals("incorrect host address", host, ip1.host());
assertEquals("incorrect network address", network, ip1.network());
assertEquals("incorrect netmask", "255.255.0.0", ip1.netmask().toString());
//unmasked
- IpAddress ip2 = IpAddress.valueOf(BYTES1);
- IpAddress umhost = IpAddress.valueOf("10.0.0.10/0");
- IpAddress umnet = IpAddress.valueOf("0.0.0.0/0");
+ IpPrefix ip2 = IpPrefix.valueOf(BYTES1);
+ IpPrefix umhost = IpPrefix.valueOf("10.0.0.10/0");
+ IpPrefix umnet = IpPrefix.valueOf("0.0.0.0/0");
assertEquals("incorrect host address", umhost, ip2.host());
assertEquals("incorrect host address", umnet, ip2.network());
assertTrue("incorrect netmask",
- Arrays.equals(IpAddress.ANY, ip2.netmask().toOctets()));
+ Arrays.equals(IpPrefix.ANY, ip2.netmask().toOctets()));
}
@Test
public void testContains() {
- IpAddress slash31 = IpAddress.valueOf(BYTES1, 31);
- IpAddress slash32 = IpAddress.valueOf(BYTES1, 32);
- IpAddress differentSlash32 = IpAddress.valueOf(BYTES2, 32);
+ IpPrefix slash31 = IpPrefix.valueOf(BYTES1, 31);
+ IpPrefix slash32 = IpPrefix.valueOf(BYTES1, 32);
+ IpPrefix differentSlash32 = IpPrefix.valueOf(BYTES2, 32);
assertTrue(slash31.contains(differentSlash32));
assertFalse(differentSlash32.contains(slash31));
@@ -88,11 +88,11 @@
assertFalse(slash32.contains(differentSlash32));
assertFalse(differentSlash32.contains(slash32));
- IpAddress zero = IpAddress.valueOf("0.0.0.0/0");
+ IpPrefix zero = IpPrefix.valueOf("0.0.0.0/0");
assertTrue(zero.contains(differentSlash32));
assertFalse(differentSlash32.contains(zero));
- IpAddress slash8 = IpAddress.valueOf("10.0.0.0/8");
+ IpPrefix slash8 = IpPrefix.valueOf("10.0.0.0/8");
assertTrue(slash8.contains(slash31));
assertFalse(slash31.contains(slash8));
}
diff --git a/utils/misc/src/test/java/org/onlab/packet/VLANIDTest.java b/utils/misc/src/test/java/org/onlab/packet/VlanIdTest.java
similarity index 97%
rename from utils/misc/src/test/java/org/onlab/packet/VLANIDTest.java
rename to utils/misc/src/test/java/org/onlab/packet/VlanIdTest.java
index 17d888c..dde9c3c 100644
--- a/utils/misc/src/test/java/org/onlab/packet/VLANIDTest.java
+++ b/utils/misc/src/test/java/org/onlab/packet/VlanIdTest.java
@@ -6,7 +6,7 @@
import com.google.common.testing.EqualsTester;
-public class VLANIDTest {
+public class VlanIdTest {
@Test
public void testEquality() {