netty4 OpenFlow southbound
- separate I/O thread and message dispatch threads
Change-Id: I11a10a47de451a9e3063b62f9450be19c3a9dae7
diff --git a/protocols/openflow/ctl/src/test/java/org/onosproject/openflow/controller/impl/OFMessageDecoderTest.java b/protocols/openflow/ctl/src/test/java/org/onosproject/openflow/controller/impl/OFMessageDecoderTest.java
index 6c109ae..f2617cd 100644
--- a/protocols/openflow/ctl/src/test/java/org/onosproject/openflow/controller/impl/OFMessageDecoderTest.java
+++ b/protocols/openflow/ctl/src/test/java/org/onosproject/openflow/controller/impl/OFMessageDecoderTest.java
@@ -16,38 +16,47 @@
package org.onosproject.openflow.controller.impl;
-import org.jboss.netty.buffer.ChannelBuffer;
-import org.jboss.netty.buffer.ChannelBuffers;
+import org.junit.After;
+import org.junit.Before;
import org.junit.Test;
-import org.onosproject.core.netty.ChannelAdapter;
+import org.onosproject.openflow.ChannelAdapter;
import org.onosproject.openflow.ChannelHandlerContextAdapter;
import org.projectfloodlight.openflow.protocol.OFHello;
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.ByteBufAllocator;
+import io.netty.channel.Channel;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.instanceOf;
-import static org.hamcrest.Matchers.notNullValue;
-import static org.hamcrest.Matchers.nullValue;
+import static org.hamcrest.Matchers.is;
+import java.util.ArrayList;
+import java.util.List;
/**
* Tests for the OpenFlow message decoder.
*/
public class OFMessageDecoderTest {
- static class ConnectedChannel extends ChannelAdapter {
- @Override
- public boolean isConnected() {
- return true;
- }
- }
+ private ByteBuf buf;
- private ChannelBuffer getHelloMessageBuffer() {
+ private ByteBuf getHelloMessageBuffer() {
// OFHello, OF version 1, xid of 0, total of 8 bytes
byte[] messageData = {0x1, 0x0, 0x0, 0x8, 0x0, 0x0, 0x0, 0x0};
- ChannelBuffer channelBuffer = ChannelBuffers.dynamicBuffer();
- channelBuffer.writeBytes(messageData);
- return channelBuffer;
+ buf.writeBytes(messageData);
+ return buf;
}
+ @Before
+ public void setUp() {
+ buf = ByteBufAllocator.DEFAULT.buffer();
+ }
+
+ @After
+ public void tearDown() {
+ buf.release();
+ }
+
+
/**
* Tests decoding a message on a closed channel.
*
@@ -55,13 +64,13 @@
*/
@Test
public void testDecodeNoChannel() throws Exception {
- OFMessageDecoder decoder = new OFMessageDecoder();
- ChannelBuffer channelBuffer = getHelloMessageBuffer();
- Object message =
- decoder.decode(new ChannelHandlerContextAdapter(),
- new ChannelAdapter(),
- channelBuffer);
- assertThat(message, nullValue());
+ OFMessageDecoder decoder = OFMessageDecoder.getInstance();
+ ByteBuf channelBuffer = getHelloMessageBuffer();
+ List<Object> out = new ArrayList<>();
+ decoder.decode(new ChannelHandlerContextAdapter(),
+ channelBuffer,
+ out);
+ assertThat(out.size(), is(0));
}
/**
@@ -71,14 +80,29 @@
*/
@Test
public void testDecode() throws Exception {
- OFMessageDecoder decoder = new OFMessageDecoder();
- ChannelBuffer channelBuffer = getHelloMessageBuffer();
- Object message =
- decoder.decode(new ChannelHandlerContextAdapter(),
- new ConnectedChannel(),
- channelBuffer);
- assertThat(message, notNullValue());
- assertThat(message, instanceOf(OFHello.class));
+ OFMessageDecoder decoder = OFMessageDecoder.getInstance();
+ ByteBuf channelBuffer = getHelloMessageBuffer();
+ List<Object> out = new ArrayList<>();
+ decoder.decode(new ActiveChannelHandlerContextAdapter(),
+ channelBuffer,
+ out);
+ assertThat(out.size(), is(1));
+ assertThat(out.get(0), instanceOf(OFHello.class));
+ }
+
+ public class ActiveChannelHandlerContextAdapter
+ extends ChannelHandlerContextAdapter {
+
+ @Override
+ public Channel channel() {
+ return new ChannelAdapter() {
+ @Override
+ public boolean isActive() {
+ return true;
+ }
+ };
+ }
+
}
}
diff --git a/protocols/openflow/ctl/src/test/java/org/onosproject/openflow/controller/impl/OFMessageEncoderTest.java b/protocols/openflow/ctl/src/test/java/org/onosproject/openflow/controller/impl/OFMessageEncoderTest.java
index e62345c..636c568 100644
--- a/protocols/openflow/ctl/src/test/java/org/onosproject/openflow/controller/impl/OFMessageEncoderTest.java
+++ b/protocols/openflow/ctl/src/test/java/org/onosproject/openflow/controller/impl/OFMessageEncoderTest.java
@@ -16,26 +16,27 @@
package org.onosproject.openflow.controller.impl;
import java.nio.charset.StandardCharsets;
-import java.util.List;
+import java.util.Collections;
import io.netty.buffer.ByteBuf;
-import org.jboss.netty.buffer.ChannelBuffer;
+import io.netty.buffer.ByteBufAllocator;
+
+import org.hamcrest.Matchers;
+import org.junit.After;
+import org.junit.Before;
import org.junit.Test;
import org.onosproject.openflow.OfMessageAdapter;
-import org.projectfloodlight.openflow.protocol.OFMessage;
import org.projectfloodlight.openflow.protocol.OFType;
-import com.google.common.collect.ImmutableList;
-
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.is;
-import static org.hamcrest.Matchers.notNullValue;
/**
* Tests for the OpenFlow message encoder.
*/
public class OFMessageEncoderTest {
+ private ByteBuf buf;
static class MockOfMessage extends OfMessageAdapter {
static int nextId = 1;
final int id;
@@ -52,40 +53,26 @@
}
}
- /**
- * Tests that encoding a non-list returns the object specified.
- *
- * @throws Exception on exception in the encoder
- */
- @Test
- public void testNoList() throws Exception {
- OFMessageEncoder encoder = new OFMessageEncoder();
- MockOfMessage message = new MockOfMessage();
- OFMessage returnedMessage =
- (OFMessage) encoder.encode(null, null, message);
- assertThat(message, is(returnedMessage));
+ @Before
+ public void setUp() {
+ buf = ByteBufAllocator.DEFAULT.buffer();
}
- /**
- * Tests that encoding a list returns the proper encoded payload.
- *
- * @throws Exception on exception in the encoder
- */
+ @After
+ public void tearDown() {
+ buf.release();
+ }
+
@Test
- public void testList() throws Exception {
- OFMessageEncoder encoder = new OFMessageEncoder();
+ public void testEncode() throws Exception {
+ OFMessageEncoder encoder = OFMessageEncoder.getInstance();
MockOfMessage message1 = new MockOfMessage();
- MockOfMessage message2 = new MockOfMessage();
- MockOfMessage message3 = new MockOfMessage();
- List<MockOfMessage> messages = ImmutableList.of(message1, message2, message3);
- ChannelBuffer returnedChannel =
- (ChannelBuffer) encoder.encode(null, null, messages);
- assertThat(returnedChannel, notNullValue());
- byte[] channelBytes = returnedChannel.array();
- String expectedListMessage = "message1 message2 message3 ";
- String listMessage =
- (new String(channelBytes, StandardCharsets.UTF_8))
- .substring(0, expectedListMessage.length());
- assertThat(listMessage, is(expectedListMessage));
+ encoder.encode(null, Collections.singletonList(message1), buf);
+
+ assertThat(buf.isReadable(), Matchers.is(true));
+ byte[] channelBytes = new byte[buf.readableBytes()];
+ buf.readBytes(channelBytes);
+ String expectedListMessage = "message1 ";
+ assertThat(channelBytes, is(expectedListMessage.getBytes()));
}
}