Implemented a mechanism to easily add and access Neighbor Discovery protocol
packet options.
Fixes ONOS-1011
Change-Id: I94daa3f3c1297fb9a7b44901927738a29aff030a
diff --git a/utils/misc/src/test/java/org/onlab/packet/ndp/NeighborAdvertisementTest.java b/utils/misc/src/test/java/org/onlab/packet/ndp/NeighborAdvertisementTest.java
index d0aa944..0c95c6f 100644
--- a/utils/misc/src/test/java/org/onlab/packet/ndp/NeighborAdvertisementTest.java
+++ b/utils/misc/src/test/java/org/onlab/packet/ndp/NeighborAdvertisementTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2014 Open Networking Laboratory
+ * Copyright 2014-2015 Open Networking Laboratory
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -13,46 +13,46 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
-
-
package org.onlab.packet.ndp;
import org.junit.BeforeClass;
import org.junit.Test;
-import org.onlab.packet.Data;
+import org.onlab.packet.MacAddress;
import static org.hamcrest.Matchers.is;
import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertTrue;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertTrue;
/**
* Tests for class {@link NeighborAdvertisement}.
*/
public class NeighborAdvertisementTest {
private static final byte[] TARGET_ADDRESS = {
- (byte) 0x20, (byte) 0x01, (byte) 0x0f, (byte) 0x18, (byte) 0x01, (byte) 0x13, (byte) 0x02, (byte) 0x15,
- (byte) 0xca, (byte) 0x2a, (byte) 0x14, (byte) 0xff, (byte) 0xfe, (byte) 0x35, (byte) 0x26, (byte) 0xce
+ (byte) 0x20, (byte) 0x01, (byte) 0x0f, (byte) 0x18,
+ (byte) 0x01, (byte) 0x13, (byte) 0x02, (byte) 0x15,
+ (byte) 0xca, (byte) 0x2a, (byte) 0x14, (byte) 0xff,
+ (byte) 0xfe, (byte) 0x35, (byte) 0x26, (byte) 0xce
};
- private static Data data;
+ private static final MacAddress MAC_ADDRESS =
+ MacAddress.valueOf("11:22:33:44:55:66");
+
private static byte[] bytePacket;
@BeforeClass
public static void setUpBeforeClass() throws Exception {
- data = new Data();
- data.setData("".getBytes());
-
- byte[] bytePayload = data.serialize();
byte[] byteHeader = {
- (byte) 0xe0, (byte) 0x00, (byte) 0x00, (byte) 0x00,
- (byte) 0x20, (byte) 0x01, (byte) 0x0f, (byte) 0x18, (byte) 0x01, (byte) 0x13, (byte) 0x02, (byte) 0x15,
- (byte) 0xca, (byte) 0x2a, (byte) 0x14, (byte) 0xff, (byte) 0xfe, (byte) 0x35, (byte) 0x26, (byte) 0xce
+ (byte) 0xe0, (byte) 0x00, (byte) 0x00, (byte) 0x00,
+ (byte) 0x20, (byte) 0x01, (byte) 0x0f, (byte) 0x18,
+ (byte) 0x01, (byte) 0x13, (byte) 0x02, (byte) 0x15,
+ (byte) 0xca, (byte) 0x2a, (byte) 0x14, (byte) 0xff,
+ (byte) 0xfe, (byte) 0x35, (byte) 0x26, (byte) 0xce,
+ (byte) 0x02, (byte) 0x01, (byte) 0x11, (byte) 0x22,
+ (byte) 0x33, (byte) 0x44, (byte) 0x55, (byte) 0x66
};
- bytePacket = new byte[byteHeader.length + bytePayload.length];
+ bytePacket = new byte[byteHeader.length];
System.arraycopy(byteHeader, 0, bytePacket, 0, byteHeader.length);
- System.arraycopy(bytePayload, 0, bytePacket, byteHeader.length, bytePayload.length);
}
/**
@@ -65,7 +65,8 @@
na.setSolicitedFlag((byte) 1);
na.setOverrideFlag((byte) 1);
na.setTargetAddress(TARGET_ADDRESS);
- na.setPayload(data);
+ na.addOption(NeighborDiscoveryOptions.TYPE_TARGET_LL_ADDRESS,
+ MAC_ADDRESS.toBytes());
assertArrayEquals(na.serialize(), bytePacket);
}
@@ -82,6 +83,13 @@
assertThat(na.getSolicitedFlag(), is((byte) 1));
assertThat(na.getOverrideFlag(), is((byte) 1));
assertArrayEquals(na.getTargetAddress(), TARGET_ADDRESS);
+
+ // Check the option(s)
+ assertThat(na.getOptions().size(), is(1));
+ NeighborDiscoveryOptions.Option option = na.getOptions().get(0);
+ assertThat(option.type(),
+ is(NeighborDiscoveryOptions.TYPE_TARGET_LL_ADDRESS));
+ assertArrayEquals(option.data(), MAC_ADDRESS.toBytes());
}
/**
@@ -94,12 +102,16 @@
na1.setSolicitedFlag((byte) 1);
na1.setOverrideFlag((byte) 1);
na1.setTargetAddress(TARGET_ADDRESS);
+ na1.addOption(NeighborDiscoveryOptions.TYPE_TARGET_LL_ADDRESS,
+ MAC_ADDRESS.toBytes());
NeighborAdvertisement na2 = new NeighborAdvertisement();
na2.setRouterFlag((byte) 1);
na2.setSolicitedFlag((byte) 1);
na2.setOverrideFlag((byte) 0);
na2.setTargetAddress(TARGET_ADDRESS);
+ na2.addOption(NeighborDiscoveryOptions.TYPE_TARGET_LL_ADDRESS,
+ MAC_ADDRESS.toBytes());
assertTrue(na1.equals(na1));
assertFalse(na1.equals(na2));
diff --git a/utils/misc/src/test/java/org/onlab/packet/ndp/NeighborSolicitationTest.java b/utils/misc/src/test/java/org/onlab/packet/ndp/NeighborSolicitationTest.java
index d0e5122..09e0117 100644
--- a/utils/misc/src/test/java/org/onlab/packet/ndp/NeighborSolicitationTest.java
+++ b/utils/misc/src/test/java/org/onlab/packet/ndp/NeighborSolicitationTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2014 Open Networking Laboratory
+ * Copyright 2014-2015 Open Networking Laboratory
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -13,47 +13,52 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
-
-
package org.onlab.packet.ndp;
import org.junit.BeforeClass;
import org.junit.Test;
-import org.onlab.packet.Data;
+import org.onlab.packet.MacAddress;
+import static org.hamcrest.Matchers.is;
import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertTrue;
import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertTrue;
+
/**
* Tests for class {@link NeighborSolicitation}.
*/
public class NeighborSolicitationTest {
private static final byte[] TARGET_ADDRESS = {
- (byte) 0x20, (byte) 0x01, (byte) 0x0f, (byte) 0x18, (byte) 0x01, (byte) 0x13, (byte) 0x02, (byte) 0x15,
- (byte) 0xca, (byte) 0x2a, (byte) 0x14, (byte) 0xff, (byte) 0xfe, (byte) 0x35, (byte) 0x26, (byte) 0xce
+ (byte) 0x20, (byte) 0x01, (byte) 0x0f, (byte) 0x18,
+ (byte) 0x01, (byte) 0x13, (byte) 0x02, (byte) 0x15,
+ (byte) 0xca, (byte) 0x2a, (byte) 0x14, (byte) 0xff,
+ (byte) 0xfe, (byte) 0x35, (byte) 0x26, (byte) 0xce
};
private static final byte[] TARGET_ADDRESS2 = {
- (byte) 0x20, (byte) 0x01, (byte) 0x0f, (byte) 0x18, (byte) 0x01, (byte) 0x13, (byte) 0x02, (byte) 0x15,
- (byte) 0xe6, (byte) 0xce, (byte) 0x8f, (byte) 0xff, (byte) 0xfe, (byte) 0x54, (byte) 0x37, (byte) 0xc8
+ (byte) 0x20, (byte) 0x01, (byte) 0x0f, (byte) 0x18,
+ (byte) 0x01, (byte) 0x13, (byte) 0x02, (byte) 0x15,
+ (byte) 0xe6, (byte) 0xce, (byte) 0x8f, (byte) 0xff,
+ (byte) 0xfe, (byte) 0x54, (byte) 0x37, (byte) 0xc8
};
- private static Data data;
+ private static final MacAddress MAC_ADDRESS =
+ MacAddress.valueOf("11:22:33:44:55:66");
+
private static byte[] bytePacket;
@BeforeClass
public static void setUpBeforeClass() throws Exception {
- data = new Data();
- data.setData("".getBytes());
-
- byte[] bytePayload = data.serialize();
byte[] byteHeader = {
- (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00,
- (byte) 0x20, (byte) 0x01, (byte) 0x0f, (byte) 0x18, (byte) 0x01, (byte) 0x13, (byte) 0x02, (byte) 0x15,
- (byte) 0xca, (byte) 0x2a, (byte) 0x14, (byte) 0xff, (byte) 0xfe, (byte) 0x35, (byte) 0x26, (byte) 0xce
+ (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00,
+ (byte) 0x20, (byte) 0x01, (byte) 0x0f, (byte) 0x18,
+ (byte) 0x01, (byte) 0x13, (byte) 0x02, (byte) 0x15,
+ (byte) 0xca, (byte) 0x2a, (byte) 0x14, (byte) 0xff,
+ (byte) 0xfe, (byte) 0x35, (byte) 0x26, (byte) 0xce,
+ (byte) 0x02, (byte) 0x01, (byte) 0x11, (byte) 0x22,
+ (byte) 0x33, (byte) 0x44, (byte) 0x55, (byte) 0x66
};
- bytePacket = new byte[byteHeader.length + bytePayload.length];
+ bytePacket = new byte[byteHeader.length];
System.arraycopy(byteHeader, 0, bytePacket, 0, byteHeader.length);
- System.arraycopy(bytePayload, 0, bytePacket, byteHeader.length, bytePayload.length);
}
/**
@@ -63,7 +68,8 @@
public void testSerialize() {
NeighborSolicitation ns = new NeighborSolicitation();
ns.setTargetAddress(TARGET_ADDRESS);
- ns.setPayload(data);
+ ns.addOption(NeighborDiscoveryOptions.TYPE_TARGET_LL_ADDRESS,
+ MAC_ADDRESS.toBytes());
assertArrayEquals(ns.serialize(), bytePacket);
}
@@ -77,6 +83,13 @@
ns.deserialize(bytePacket, 0, bytePacket.length);
assertArrayEquals(ns.getTargetAddress(), TARGET_ADDRESS);
+
+ // Check the option(s)
+ assertThat(ns.getOptions().size(), is(1));
+ NeighborDiscoveryOptions.Option option = ns.getOptions().get(0);
+ assertThat(option.type(),
+ is(NeighborDiscoveryOptions.TYPE_TARGET_LL_ADDRESS));
+ assertArrayEquals(option.data(), MAC_ADDRESS.toBytes());
}
/**
@@ -86,9 +99,13 @@
public void testEqual() {
NeighborSolicitation ns1 = new NeighborSolicitation();
ns1.setTargetAddress(TARGET_ADDRESS);
+ ns1.addOption(NeighborDiscoveryOptions.TYPE_TARGET_LL_ADDRESS,
+ MAC_ADDRESS.toBytes());
NeighborSolicitation ns2 = new NeighborSolicitation();
ns2.setTargetAddress(TARGET_ADDRESS2);
+ ns2.addOption(NeighborDiscoveryOptions.TYPE_TARGET_LL_ADDRESS,
+ MAC_ADDRESS.toBytes());
assertTrue(ns1.equals(ns1));
assertFalse(ns1.equals(ns2));
diff --git a/utils/misc/src/test/java/org/onlab/packet/ndp/RedirectTest.java b/utils/misc/src/test/java/org/onlab/packet/ndp/RedirectTest.java
index 2f419c7..865f03a 100644
--- a/utils/misc/src/test/java/org/onlab/packet/ndp/RedirectTest.java
+++ b/utils/misc/src/test/java/org/onlab/packet/ndp/RedirectTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2014 Open Networking Laboratory
+ * Copyright 2014-2015 Open Networking Laboratory
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -13,54 +13,62 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
-
-
package org.onlab.packet.ndp;
import org.junit.BeforeClass;
import org.junit.Test;
-import org.onlab.packet.Data;
+import org.onlab.packet.MacAddress;
+import static org.hamcrest.Matchers.is;
import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertTrue;
import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertTrue;
/**
* Tests for class {@link Redirect}.
*/
public class RedirectTest {
private static final byte[] TARGET_ADDRESS = {
- (byte) 0x20, (byte) 0x01, (byte) 0x0f, (byte) 0x18, (byte) 0x01, (byte) 0x13, (byte) 0x02, (byte) 0x15,
- (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00
+ (byte) 0x20, (byte) 0x01, (byte) 0x0f, (byte) 0x18,
+ (byte) 0x01, (byte) 0x13, (byte) 0x02, (byte) 0x15,
+ (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00,
+ (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00
};
private static final byte[] DESTINATION_ADDRESS = {
- (byte) 0x20, (byte) 0x01, (byte) 0x0f, (byte) 0x18, (byte) 0x01, (byte) 0x13, (byte) 0x02, (byte) 0x15,
- (byte) 0xca, (byte) 0x2a, (byte) 0x14, (byte) 0xff, (byte) 0xfe, (byte) 0x35, (byte) 0x26, (byte) 0xce
+ (byte) 0x20, (byte) 0x01, (byte) 0x0f, (byte) 0x18,
+ (byte) 0x01, (byte) 0x13, (byte) 0x02, (byte) 0x15,
+ (byte) 0xca, (byte) 0x2a, (byte) 0x14, (byte) 0xff,
+ (byte) 0xfe, (byte) 0x35, (byte) 0x26, (byte) 0xce
};
private static final byte[] DESTINATION_ADDRESS2 = {
- (byte) 0x20, (byte) 0x01, (byte) 0x0f, (byte) 0x18, (byte) 0x01, (byte) 0x13, (byte) 0x02, (byte) 0x15,
- (byte) 0xe6, (byte) 0xce, (byte) 0x8f, (byte) 0xff, (byte) 0xfe, (byte) 0x54, (byte) 0x37, (byte) 0xc8
+ (byte) 0x20, (byte) 0x01, (byte) 0x0f, (byte) 0x18,
+ (byte) 0x01, (byte) 0x13, (byte) 0x02, (byte) 0x15,
+ (byte) 0xe6, (byte) 0xce, (byte) 0x8f, (byte) 0xff,
+ (byte) 0xfe, (byte) 0x54, (byte) 0x37, (byte) 0xc8
};
- private static Data data;
+ private static final MacAddress MAC_ADDRESS =
+ MacAddress.valueOf("11:22:33:44:55:66");
+
private static byte[] bytePacket;
@BeforeClass
public static void setUpBeforeClass() throws Exception {
- data = new Data();
- data.setData("".getBytes());
-
- byte[] bytePayload = data.serialize();
byte[] byteHeader = {
- (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00,
- (byte) 0x20, (byte) 0x01, (byte) 0x0f, (byte) 0x18, (byte) 0x01, (byte) 0x13, (byte) 0x02, (byte) 0x15,
- (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00,
- (byte) 0x20, (byte) 0x01, (byte) 0x0f, (byte) 0x18, (byte) 0x01, (byte) 0x13, (byte) 0x02, (byte) 0x15,
- (byte) 0xca, (byte) 0x2a, (byte) 0x14, (byte) 0xff, (byte) 0xfe, (byte) 0x35, (byte) 0x26, (byte) 0xce
+ (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00,
+ (byte) 0x20, (byte) 0x01, (byte) 0x0f, (byte) 0x18,
+ (byte) 0x01, (byte) 0x13, (byte) 0x02, (byte) 0x15,
+ (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00,
+ (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00,
+ (byte) 0x20, (byte) 0x01, (byte) 0x0f, (byte) 0x18,
+ (byte) 0x01, (byte) 0x13, (byte) 0x02, (byte) 0x15,
+ (byte) 0xca, (byte) 0x2a, (byte) 0x14, (byte) 0xff,
+ (byte) 0xfe, (byte) 0x35, (byte) 0x26, (byte) 0xce,
+ (byte) 0x02, (byte) 0x01, (byte) 0x11, (byte) 0x22,
+ (byte) 0x33, (byte) 0x44, (byte) 0x55, (byte) 0x66
};
- bytePacket = new byte[byteHeader.length + bytePayload.length];
+ bytePacket = new byte[byteHeader.length];
System.arraycopy(byteHeader, 0, bytePacket, 0, byteHeader.length);
- System.arraycopy(bytePayload, 0, bytePacket, byteHeader.length, bytePayload.length);
}
/**
@@ -71,7 +79,8 @@
Redirect rd = new Redirect();
rd.setTargetAddress(TARGET_ADDRESS);
rd.setDestinationAddress(DESTINATION_ADDRESS);
- rd.setPayload(data);
+ rd.addOption(NeighborDiscoveryOptions.TYPE_TARGET_LL_ADDRESS,
+ MAC_ADDRESS.toBytes());
assertArrayEquals(rd.serialize(), bytePacket);
}
@@ -86,6 +95,13 @@
assertArrayEquals(rd.getTargetAddress(), TARGET_ADDRESS);
assertArrayEquals(rd.getDestinationAddress(), DESTINATION_ADDRESS);
+
+ // Check the option(s)
+ assertThat(rd.getOptions().size(), is(1));
+ NeighborDiscoveryOptions.Option option = rd.getOptions().get(0);
+ assertThat(option.type(),
+ is(NeighborDiscoveryOptions.TYPE_TARGET_LL_ADDRESS));
+ assertArrayEquals(option.data(), MAC_ADDRESS.toBytes());
}
/**
@@ -96,10 +112,14 @@
Redirect rd1 = new Redirect();
rd1.setTargetAddress(TARGET_ADDRESS);
rd1.setDestinationAddress(DESTINATION_ADDRESS);
+ rd1.addOption(NeighborDiscoveryOptions.TYPE_TARGET_LL_ADDRESS,
+ MAC_ADDRESS.toBytes());
Redirect rd2 = new Redirect();
rd2.setTargetAddress(TARGET_ADDRESS);
rd2.setDestinationAddress(DESTINATION_ADDRESS2);
+ rd2.addOption(NeighborDiscoveryOptions.TYPE_TARGET_LL_ADDRESS,
+ MAC_ADDRESS.toBytes());
assertTrue(rd1.equals(rd1));
assertFalse(rd1.equals(rd2));
diff --git a/utils/misc/src/test/java/org/onlab/packet/ndp/RouterAdvertisementTest.java b/utils/misc/src/test/java/org/onlab/packet/ndp/RouterAdvertisementTest.java
index 2fd1815..b69d142 100644
--- a/utils/misc/src/test/java/org/onlab/packet/ndp/RouterAdvertisementTest.java
+++ b/utils/misc/src/test/java/org/onlab/packet/ndp/RouterAdvertisementTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2014 Open Networking Laboratory
+ * Copyright 2014-2015 Open Networking Laboratory
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -13,14 +13,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
-
-
package org.onlab.packet.ndp;
import org.junit.BeforeClass;
import org.junit.Test;
-import org.onlab.packet.Data;
+import org.onlab.packet.MacAddress;
import static org.hamcrest.Matchers.is;
import static org.junit.Assert.assertArrayEquals;
@@ -32,23 +29,22 @@
* Tests for class {@link RouterAdvertisement}.
*/
public class RouterAdvertisementTest {
- private static Data data;
+ private static final MacAddress MAC_ADDRESS =
+ MacAddress.valueOf("11:22:33:44:55:66");
+
private static byte[] bytePacket;
@BeforeClass
public static void setUpBeforeClass() throws Exception {
- data = new Data();
- data.setData("".getBytes());
-
- byte[] bytePayload = data.serialize();
byte[] byteHeader = {
- (byte) 0x03, (byte) 0xc0, (byte) 0x02, (byte) 0x58,
- (byte) 0x00, (byte) 0x00, (byte) 0x03, (byte) 0xe8,
- (byte) 0x00, (byte) 0x00, (byte) 0x01, (byte) 0xf4
+ (byte) 0x03, (byte) 0xc0, (byte) 0x02, (byte) 0x58,
+ (byte) 0x00, (byte) 0x00, (byte) 0x03, (byte) 0xe8,
+ (byte) 0x00, (byte) 0x00, (byte) 0x01, (byte) 0xf4,
+ (byte) 0x02, (byte) 0x01, (byte) 0x11, (byte) 0x22,
+ (byte) 0x33, (byte) 0x44, (byte) 0x55, (byte) 0x66
};
- bytePacket = new byte[byteHeader.length + bytePayload.length];
+ bytePacket = new byte[byteHeader.length];
System.arraycopy(byteHeader, 0, bytePacket, 0, byteHeader.length);
- System.arraycopy(bytePayload, 0, bytePacket, byteHeader.length, bytePayload.length);
}
/**
@@ -63,7 +59,8 @@
ra.setRouterLifetime((short) 0x258);
ra.setReachableTime(0x3e8);
ra.setRetransmitTimer(0x1f4);
- ra.setPayload(data);
+ ra.addOption(NeighborDiscoveryOptions.TYPE_TARGET_LL_ADDRESS,
+ MAC_ADDRESS.toBytes());
assertArrayEquals(ra.serialize(), bytePacket);
}
@@ -82,6 +79,13 @@
assertThat(ra.getRouterLifetime(), is((short) 0x258));
assertThat(ra.getReachableTime(), is(0x3e8));
assertThat(ra.getRetransmitTimer(), is(0x1f4));
+
+ // Check the option(s)
+ assertThat(ra.getOptions().size(), is(1));
+ NeighborDiscoveryOptions.Option option = ra.getOptions().get(0);
+ assertThat(option.type(),
+ is(NeighborDiscoveryOptions.TYPE_TARGET_LL_ADDRESS));
+ assertArrayEquals(option.data(), MAC_ADDRESS.toBytes());
}
/**
@@ -96,6 +100,8 @@
ra1.setRouterLifetime((short) 0x258);
ra1.setReachableTime(0x3e8);
ra1.setRetransmitTimer(0x1f4);
+ ra1.addOption(NeighborDiscoveryOptions.TYPE_TARGET_LL_ADDRESS,
+ MAC_ADDRESS.toBytes());
RouterAdvertisement ra2 = new RouterAdvertisement();
ra2.setCurrentHopLimit((byte) 3);
@@ -104,6 +110,8 @@
ra2.setRouterLifetime((short) 0x1f4);
ra2.setReachableTime(0x3e8);
ra2.setRetransmitTimer(0x1f4);
+ ra2.addOption(NeighborDiscoveryOptions.TYPE_TARGET_LL_ADDRESS,
+ MAC_ADDRESS.toBytes());
assertTrue(ra1.equals(ra1));
assertFalse(ra1.equals(ra2));
diff --git a/utils/misc/src/test/java/org/onlab/packet/ndp/RouterSolicitationTest.java b/utils/misc/src/test/java/org/onlab/packet/ndp/RouterSolicitationTest.java
index a5ce194..9c087e3 100644
--- a/utils/misc/src/test/java/org/onlab/packet/ndp/RouterSolicitationTest.java
+++ b/utils/misc/src/test/java/org/onlab/packet/ndp/RouterSolicitationTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2014 Open Networking Laboratory
+ * Copyright 2014-2015 Open Networking Laboratory
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -13,38 +13,38 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
-
-
package org.onlab.packet.ndp;
import org.junit.BeforeClass;
import org.junit.Test;
-import org.onlab.packet.Data;
+import org.onlab.packet.MacAddress;
+import static org.hamcrest.Matchers.is;
import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertThat;
import static org.junit.Assert.assertTrue;
/**
* Tests for class {@link RouterSolicitation}.
*/
public class RouterSolicitationTest {
- private static final byte[] OPTION = {
- (byte) 0x01, (byte) 0x08, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x01
- };
- private static Data data;
+ private static final MacAddress MAC_ADDRESS1 =
+ MacAddress.valueOf("11:22:33:44:55:66");
+ private static final MacAddress MAC_ADDRESS2 =
+ MacAddress.valueOf("11:22:33:44:55:00");
+
private static byte[] bytePacket;
@BeforeClass
public static void setUpBeforeClass() throws Exception {
- data = new Data();
- data.setData(OPTION);
-
- byte[] bytePayload = data.serialize();
- byte[] byteHeader = {(byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00};
- bytePacket = new byte[byteHeader.length + bytePayload.length];
+ byte[] byteHeader = {
+ (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00,
+ (byte) 0x02, (byte) 0x01, (byte) 0x11, (byte) 0x22,
+ (byte) 0x33, (byte) 0x44, (byte) 0x55, (byte) 0x66
+ };
+ bytePacket = new byte[byteHeader.length];
System.arraycopy(byteHeader, 0, bytePacket, 0, byteHeader.length);
- System.arraycopy(bytePayload, 0, bytePacket, byteHeader.length, bytePayload.length);
}
/**
@@ -53,7 +53,8 @@
@Test
public void testSerialize() {
RouterSolicitation rs = new RouterSolicitation();
- rs.setPayload(data);
+ rs.addOption(NeighborDiscoveryOptions.TYPE_TARGET_LL_ADDRESS,
+ MAC_ADDRESS1.toBytes());
assertArrayEquals(rs.serialize(), bytePacket);
}
@@ -65,6 +66,13 @@
public void testDeserialize() {
RouterSolicitation rs = new RouterSolicitation();
rs.deserialize(bytePacket, 0, bytePacket.length);
+
+ // Check the option(s)
+ assertThat(rs.getOptions().size(), is(1));
+ NeighborDiscoveryOptions.Option option = rs.getOptions().get(0);
+ assertThat(option.type(),
+ is(NeighborDiscoveryOptions.TYPE_TARGET_LL_ADDRESS));
+ assertArrayEquals(option.data(), MAC_ADDRESS1.toBytes());
}
/**
@@ -73,7 +81,14 @@
@Test
public void testEqual() {
RouterSolicitation rs1 = new RouterSolicitation();
+ rs1.addOption(NeighborDiscoveryOptions.TYPE_TARGET_LL_ADDRESS,
+ MAC_ADDRESS1.toBytes());
+
+ RouterSolicitation rs2 = new RouterSolicitation();
+ rs2.addOption(NeighborDiscoveryOptions.TYPE_TARGET_LL_ADDRESS,
+ MAC_ADDRESS2.toBytes());
assertTrue(rs1.equals(rs1));
+ assertFalse(rs1.equals(rs2));
}
}