Implement NDP-related classes
* Resolve ONOS-511
* Refactor: Move NDP-related classes into org.onlab.packet.ndp package
* Bugfix: payload is not properly set in testSerialize
Change-Id: Idb2dbfbd0297152c0e26ac2d5d5f8dba62824660
diff --git a/utils/misc/src/test/java/org/onlab/packet/NeighborAdvertisementTest.java b/utils/misc/src/test/java/org/onlab/packet/ndp/NeighborAdvertisementTest.java
similarity index 92%
rename from utils/misc/src/test/java/org/onlab/packet/NeighborAdvertisementTest.java
rename to utils/misc/src/test/java/org/onlab/packet/ndp/NeighborAdvertisementTest.java
index 8627a9b..d0aa944 100644
--- a/utils/misc/src/test/java/org/onlab/packet/NeighborAdvertisementTest.java
+++ b/utils/misc/src/test/java/org/onlab/packet/ndp/NeighborAdvertisementTest.java
@@ -16,13 +16,17 @@
-package org.onlab.packet;
+package org.onlab.packet.ndp;
import org.junit.BeforeClass;
import org.junit.Test;
+import org.onlab.packet.Data;
import static org.hamcrest.Matchers.is;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertThat;
/**
* Tests for class {@link NeighborAdvertisement}.
@@ -61,6 +65,7 @@
na.setSolicitedFlag((byte) 1);
na.setOverrideFlag((byte) 1);
na.setTargetAddress(TARGET_ADDRESS);
+ na.setPayload(data);
assertArrayEquals(na.serialize(), bytePacket);
}
diff --git a/utils/misc/src/test/java/org/onlab/packet/NeighborSolicitationTest.java b/utils/misc/src/test/java/org/onlab/packet/ndp/NeighborSolicitationTest.java
similarity index 91%
rename from utils/misc/src/test/java/org/onlab/packet/NeighborSolicitationTest.java
rename to utils/misc/src/test/java/org/onlab/packet/ndp/NeighborSolicitationTest.java
index bb6ec60..d0e5122 100644
--- a/utils/misc/src/test/java/org/onlab/packet/NeighborSolicitationTest.java
+++ b/utils/misc/src/test/java/org/onlab/packet/ndp/NeighborSolicitationTest.java
@@ -16,15 +16,17 @@
-package org.onlab.packet;
+package org.onlab.packet.ndp;
import org.junit.BeforeClass;
import org.junit.Test;
+import org.onlab.packet.Data;
-import static org.junit.Assert.*;
-
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.assertFalse;
/**
- * Tests for class {@link org.onlab.packet.NeighborSolicitation}.
+ * Tests for class {@link NeighborSolicitation}.
*/
public class NeighborSolicitationTest {
private static final byte[] TARGET_ADDRESS = {
@@ -61,6 +63,7 @@
public void testSerialize() {
NeighborSolicitation ns = new NeighborSolicitation();
ns.setTargetAddress(TARGET_ADDRESS);
+ ns.setPayload(data);
assertArrayEquals(ns.serialize(), bytePacket);
}
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
new file mode 100644
index 0000000..2f419c7
--- /dev/null
+++ b/utils/misc/src/test/java/org/onlab/packet/ndp/RedirectTest.java
@@ -0,0 +1,107 @@
+/*
+ * Copyright 2014 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.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * 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 static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.assertFalse;
+
+/**
+ * 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
+ };
+ 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
+ };
+ 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
+ };
+ private static Data data;
+ 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
+ };
+ bytePacket = new byte[byteHeader.length + bytePayload.length];
+ System.arraycopy(byteHeader, 0, bytePacket, 0, byteHeader.length);
+ System.arraycopy(bytePayload, 0, bytePacket, byteHeader.length, bytePayload.length);
+ }
+
+ /**
+ * Tests serialize and setters.
+ */
+ @Test
+ public void testSerialize() {
+ Redirect rd = new Redirect();
+ rd.setTargetAddress(TARGET_ADDRESS);
+ rd.setDestinationAddress(DESTINATION_ADDRESS);
+ rd.setPayload(data);
+
+ assertArrayEquals(rd.serialize(), bytePacket);
+ }
+
+ /**
+ * Tests deserialize and getters.
+ */
+ @Test
+ public void testDeserialize() {
+ Redirect rd = new Redirect();
+ rd.deserialize(bytePacket, 0, bytePacket.length);
+
+ assertArrayEquals(rd.getTargetAddress(), TARGET_ADDRESS);
+ assertArrayEquals(rd.getDestinationAddress(), DESTINATION_ADDRESS);
+ }
+
+ /**
+ * Tests comparator.
+ */
+ @Test
+ public void testEqual() {
+ Redirect rd1 = new Redirect();
+ rd1.setTargetAddress(TARGET_ADDRESS);
+ rd1.setDestinationAddress(DESTINATION_ADDRESS);
+
+ Redirect rd2 = new Redirect();
+ rd2.setTargetAddress(TARGET_ADDRESS);
+ rd2.setDestinationAddress(DESTINATION_ADDRESS2);
+
+ 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
new file mode 100644
index 0000000..2fd1815
--- /dev/null
+++ b/utils/misc/src/test/java/org/onlab/packet/ndp/RouterAdvertisementTest.java
@@ -0,0 +1,111 @@
+/*
+ * Copyright 2014 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.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * 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 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 RouterAdvertisement}.
+ */
+public class RouterAdvertisementTest {
+ private static Data data;
+ 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
+ };
+ bytePacket = new byte[byteHeader.length + bytePayload.length];
+ System.arraycopy(byteHeader, 0, bytePacket, 0, byteHeader.length);
+ System.arraycopy(bytePayload, 0, bytePacket, byteHeader.length, bytePayload.length);
+ }
+
+ /**
+ * Tests serialize and setters.
+ */
+ @Test
+ public void testSerialize() {
+ RouterAdvertisement ra = new RouterAdvertisement();
+ ra.setCurrentHopLimit((byte) 3);
+ ra.setMFlag((byte) 1);
+ ra.setOFlag((byte) 1);
+ ra.setRouterLifetime((short) 0x258);
+ ra.setReachableTime(0x3e8);
+ ra.setRetransmitTimer(0x1f4);
+ ra.setPayload(data);
+
+ assertArrayEquals(ra.serialize(), bytePacket);
+ }
+
+ /**
+ * Tests deserialize and getters.
+ */
+ @Test
+ public void testDeserialize() {
+ RouterAdvertisement ra = new RouterAdvertisement();
+ ra.deserialize(bytePacket, 0, bytePacket.length);
+
+ assertThat(ra.getCurrentHopLimit(), is((byte) 3));
+ assertThat(ra.getMFlag(), is((byte) 1));
+ assertThat(ra.getOFlag(), is((byte) 1));
+ assertThat(ra.getRouterLifetime(), is((short) 0x258));
+ assertThat(ra.getReachableTime(), is(0x3e8));
+ assertThat(ra.getRetransmitTimer(), is(0x1f4));
+ }
+
+ /**
+ * Tests comparator.
+ */
+ @Test
+ public void testEqual() {
+ RouterAdvertisement ra1 = new RouterAdvertisement();
+ ra1.setCurrentHopLimit((byte) 3);
+ ra1.setMFlag((byte) 1);
+ ra1.setOFlag((byte) 1);
+ ra1.setRouterLifetime((short) 0x258);
+ ra1.setReachableTime(0x3e8);
+ ra1.setRetransmitTimer(0x1f4);
+
+ RouterAdvertisement ra2 = new RouterAdvertisement();
+ ra2.setCurrentHopLimit((byte) 3);
+ ra2.setMFlag((byte) 0);
+ ra2.setOFlag((byte) 0);
+ ra2.setRouterLifetime((short) 0x1f4);
+ ra2.setReachableTime(0x3e8);
+ ra2.setRetransmitTimer(0x1f4);
+
+ 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
new file mode 100644
index 0000000..a5ce194
--- /dev/null
+++ b/utils/misc/src/test/java/org/onlab/packet/ndp/RouterSolicitationTest.java
@@ -0,0 +1,79 @@
+/*
+ * Copyright 2014 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.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * 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 static org.junit.Assert.assertArrayEquals;
+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 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];
+ System.arraycopy(byteHeader, 0, bytePacket, 0, byteHeader.length);
+ System.arraycopy(bytePayload, 0, bytePacket, byteHeader.length, bytePayload.length);
+ }
+
+ /**
+ * Tests serialize and setters.
+ */
+ @Test
+ public void testSerialize() {
+ RouterSolicitation rs = new RouterSolicitation();
+ rs.setPayload(data);
+
+ assertArrayEquals(rs.serialize(), bytePacket);
+ }
+
+ /**
+ * Tests deserialize and getters.
+ */
+ @Test
+ public void testDeserialize() {
+ RouterSolicitation rs = new RouterSolicitation();
+ rs.deserialize(bytePacket, 0, bytePacket.length);
+ }
+
+ /**
+ * Tests comparator.
+ */
+ @Test
+ public void testEqual() {
+ RouterSolicitation rs1 = new RouterSolicitation();
+
+ assertTrue(rs1.equals(rs1));
+ }
+}