bump netty to version 4.0.10.Final
authorMartin Bobak <martin.bobak@pantheon.sk>
Mon, 21 Oct 2013 14:18:41 +0000 (16:18 +0200)
committerMartin Bobak <mbobak@cisco.com>
Tue, 22 Oct 2013 09:31:30 +0000 (11:31 +0200)
Change-Id: Ia3cd0b6a0443d252971cfd0beb59bd5ccc800116
Signed-off-by: Martin Bobak <mbobak@cisco.com>
12 files changed:
opendaylight/netconf/config-netconf-connector/pom.xml
opendaylight/netconf/config-persister-impl/pom.xml
opendaylight/netconf/netconf-api/pom.xml
opendaylight/netconf/netconf-api/src/main/java/org/opendaylight/controller/netconf/api/NetconfMessage.java
opendaylight/netconf/netconf-client/pom.xml
opendaylight/netconf/netconf-impl/pom.xml
opendaylight/netconf/netconf-impl/src/test/java/org/opendaylight/controller/netconf/impl/MessageParserTest.java
opendaylight/netconf/netconf-it/pom.xml
opendaylight/netconf/netconf-it/src/test/java/org/opendaylight/controller/netconf/it/NetconfITTest.java
opendaylight/netconf/netconf-util/pom.xml
opendaylight/netconf/netconf-util/src/main/java/org/opendaylight/controller/netconf/util/messages/NetconfMessageFactory.java
opendaylight/netconf/pom.xml

index 0386378321815978101cd768ec101ca80a1c8afa..f8bc7720d1d5681270e7cd0b45fa5c2bb679efbb 100755 (executable)
         <dependency>
             <groupId>org.opendaylight.bgpcep</groupId>
             <artifactId>mockito-configuration</artifactId>
+            <version>${bgpcep.version}</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
index c86202b6fb51765e247fec2840dc030066043045..a69c87f0a4d15106caf10a8b89a16720badeac9e 100644 (file)
@@ -55,6 +55,7 @@
         <dependency>
             <groupId>org.opendaylight.bgpcep</groupId>
             <artifactId>mockito-configuration</artifactId>
+            <version>${bgpcep.version}</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
index 57e77cc945f7fe91320a65b2e00379afc64e4125..5c18eddcf53d76fc0c41b609463d9f4c356391ba 100644 (file)
@@ -22,6 +22,7 @@
         <dependency>
             <groupId>org.opendaylight.bgpcep</groupId>
             <artifactId>framework</artifactId>
+            <version>${bgpcep.version}</version>
         </dependency>
     </dependencies>
 
index 33d41b0470516c15f277b183b146470e3cffdc83..e5a9e18576afbca754a3b111b4574ae54f9ff64f 100644 (file)
@@ -8,14 +8,13 @@
 
 package org.opendaylight.controller.netconf.api;
 
-import org.opendaylight.protocol.framework.ProtocolMessage;
 import org.w3c.dom.Document;
 
 /**
  * NetconfMessage represents a wrapper around org.w3c.dom.Document. Needed for
  * implementing ProtocolMessage interface.
  */
-public final class NetconfMessage implements ProtocolMessage {
+public final class NetconfMessage {
 
     private static final long serialVersionUID = 462175939836367285L;
 
index ac949f54458cf00a8c79e6b31f24fcd7d48fec44..d8dee68253201599ea71cc29b0c9a9492296bf26 100644 (file)
@@ -26,6 +26,7 @@
         <dependency>
             <groupId>org.opendaylight.bgpcep</groupId>
             <artifactId>framework</artifactId>
+            <version>${bgpcep.version}</version>
         </dependency>
 
         <dependency>
index dd1c91ee51c74072b29b7184aa8b5dcecbb77ed7..8e0d493c2702793fd010d71384f18c651b2f915b 100644 (file)
         <dependency>
             <groupId>org.opendaylight.bgpcep</groupId>
             <artifactId>util</artifactId>
+            <version>${bgpcep.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.opendaylight.bgpcep</groupId>
             <artifactId>framework</artifactId>
+            <version>${bgpcep.version}</version>
         </dependency>
 
         <dependency>
@@ -63,6 +65,7 @@
         <dependency>
             <groupId>org.opendaylight.bgpcep</groupId>
             <artifactId>mockito-configuration</artifactId>
+            <version>${bgpcep.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
index 3b88a231083fa50a1a1f6e7326d6a8d3fc6f0d29..7e9318e0d69796eeaf4b54fe8080e7eef8ff395f 100644 (file)
@@ -10,100 +10,82 @@ package org.opendaylight.controller.netconf.impl;
 
 import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
 
-import java.util.Queue;
+import java.io.IOException;
 
-import io.netty.buffer.ByteBuf;
-import io.netty.channel.embedded.EmbeddedChannel;
+import javax.xml.parsers.ParserConfigurationException;
 
+import org.custommonkey.xmlunit.XMLAssert;
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.opendaylight.controller.netconf.api.NetconfMessage;
-import org.opendaylight.controller.netconf.util.handler.FramingMechanismHandlerFactory;
-import org.opendaylight.controller.netconf.util.handler.NetconfMessageAggregator;
-import org.opendaylight.controller.netconf.util.handler.NetconfMessageChunkDecoder;
 import org.opendaylight.controller.netconf.util.messages.FramingMechanism;
 import org.opendaylight.controller.netconf.util.messages.NetconfMessageFactory;
-import org.opendaylight.controller.netconf.util.messages.NetconfMessageHeader;
 import org.opendaylight.controller.netconf.util.test.XmlFileLoader;
-import org.opendaylight.protocol.framework.ProtocolMessageDecoder;
-import org.opendaylight.protocol.framework.ProtocolMessageEncoder;
+import org.opendaylight.controller.netconf.util.xml.XmlUtil;
+import org.opendaylight.protocol.framework.DeserializerException;
+import org.opendaylight.protocol.framework.DocumentedException;
+import org.opendaylight.protocol.util.ByteArray;
+import org.w3c.dom.Document;
+import org.xml.sax.SAXException;
 
 public class MessageParserTest {
 
-    private NetconfMessage msg;
-    private NetconfMessageFactory msgFactory = new NetconfMessageFactory();
+    private NetconfMessageFactory parser = null;
 
     @Before
-    public void setUp() throws Exception {
-        this.msg = XmlFileLoader.xmlFileToNetconfMessage("netconfMessages/getConfig.xml");
+    public void setUp() {
+        this.parser = new NetconfMessageFactory();
     }
 
     @Test
-    public void testChunkedFramingMechanismOnPipeline() throws Exception {
-        EmbeddedChannel testChunkChannel = new EmbeddedChannel(
-                FramingMechanismHandlerFactory.createHandler(FramingMechanism.CHUNK),
-                new ProtocolMessageEncoder<NetconfMessage>(msgFactory),
-
-                new NetconfMessageAggregator(FramingMechanism.CHUNK), new NetconfMessageChunkDecoder(),
-                new ProtocolMessageDecoder<NetconfMessage>(msgFactory));
-
-        testChunkChannel.writeOutbound(this.msg);
-        Queue<Object> messages = testChunkChannel.outboundMessages();
-        assertFalse(messages.isEmpty());
-
-        int msgLength = msgFactory.put(this.msg).length;
-        int chunkCount = msgLength / NetconfMessageFactory.MAX_CHUNK_SIZE;
-        if ((msgLength % NetconfMessageFactory.MAX_CHUNK_SIZE) != 0) {
-            chunkCount++;
-        }
-        for (int i = 1; i <= chunkCount; i++) {
-            ByteBuf recievedOutbound = (ByteBuf) messages.poll();
-            int exptHeaderLength = NetconfMessageFactory.MAX_CHUNK_SIZE;
-            if (i == chunkCount) {
-                exptHeaderLength = msgLength - (NetconfMessageFactory.MAX_CHUNK_SIZE * (i - 1));
-                byte[] eom = new byte[NetconfMessageFactory.endOfChunk.length];
-                recievedOutbound.getBytes(recievedOutbound.readableBytes() - NetconfMessageFactory.endOfChunk.length,
-                        eom);
-                assertArrayEquals(NetconfMessageFactory.endOfChunk, eom);
-            }
-
-            byte[] header = new byte[String.valueOf(exptHeaderLength).length() + NetconfMessageHeader.MIN_HEADER_LENGTH
-                    - 1];
-            recievedOutbound.getBytes(0, header);
-            NetconfMessageHeader messageHeader = new NetconfMessageHeader();
-            messageHeader.fromBytes(header);
-            assertEquals(exptHeaderLength, messageHeader.getLength());
-
-            testChunkChannel.writeInbound(recievedOutbound);
-        }
-        assertTrue(messages.isEmpty());
-
-        NetconfMessage receivedMessage = (NetconfMessage) testChunkChannel.readInbound();
-        assertNotNull(receivedMessage);
-        assertTrue(this.msg.getDocument().isEqualNode(receivedMessage.getDocument()));
+    public void testPutEOM() throws IOException, SAXException, ParserConfigurationException {
+        final NetconfMessage msg = XmlFileLoader.xmlFileToNetconfMessage("netconfMessages/client_hello.xml");
+        final byte[] bytes = this.parser.put(msg);
+        assertArrayEquals(NetconfMessageFactory.endOfMessage, ByteArray.subByte(bytes, bytes.length
+                - NetconfMessageFactory.endOfMessage.length, NetconfMessageFactory.endOfMessage.length));
     }
 
+    @Ignore
     @Test
-    public void testEOMFramingMechanismOnPipeline() throws Exception {
-        EmbeddedChannel testChunkChannel = new EmbeddedChannel(
-                FramingMechanismHandlerFactory.createHandler(FramingMechanism.EOM),
-                new ProtocolMessageEncoder<NetconfMessage>(msgFactory), new NetconfMessageAggregator(
-                        FramingMechanism.EOM), new ProtocolMessageDecoder<NetconfMessage>(msgFactory));
-
-        testChunkChannel.writeOutbound(this.msg);
-        ByteBuf recievedOutbound = (ByteBuf) testChunkChannel.readOutbound();
+    // TODO not working on WINDOWS
+    // arrays first differed at element [4]; expected:<49> but was:<53>
+    // at
+    // org.junit.internal.ComparisonCriteria.arrayEquals(ComparisonCriteria.java:52)
+    public void testPutChunk() throws IOException, SAXException, ParserConfigurationException {
+        final NetconfMessage msg = XmlFileLoader.xmlFileToNetconfMessage("netconfMessages/client_hello.xml");
+        this.parser.setFramingMechanism(FramingMechanism.CHUNK);
+        final byte[] bytes = this.parser.put(msg);
+        final byte[] header = new byte[] { (byte) 0x0a, (byte) 0x23 , (byte) 0x32, (byte) 0x31, (byte) 0x31, (byte) 0x0a};
+        assertArrayEquals(header, ByteArray.subByte(bytes, 0, header.length));
+        assertArrayEquals(NetconfMessageFactory.endOfChunk, ByteArray.subByte(bytes, bytes.length
+                - NetconfMessageFactory.endOfChunk.length, NetconfMessageFactory.endOfChunk.length));
+    }
 
-        byte[] eom = new byte[NetconfMessageFactory.endOfMessage.length];
-        recievedOutbound.getBytes(recievedOutbound.readableBytes() - NetconfMessageFactory.endOfMessage.length, eom);
-        assertArrayEquals(NetconfMessageFactory.endOfMessage, eom);
+    @Test
+    public void testParseEOM() throws IOException, SAXException, DeserializerException, DocumentedException,
+            ParserConfigurationException {
+        final Document msg = XmlFileLoader.xmlFileToDocument("netconfMessages/client_hello.xml");
+        final byte[] bytes = this.parser.put(new NetconfMessage(msg));
+        final Document doc = this.parser
+                .parse(ByteArray.subByte(bytes, 0, bytes.length - NetconfMessageFactory.endOfMessage.length))
+                .getDocument();
+        assertEquals(XmlUtil.toString(msg), XmlUtil.toString(doc));
+        XMLAssert.assertXMLEqual(msg, doc);
+    }
 
-        testChunkChannel.writeInbound(recievedOutbound);
-        NetconfMessage receivedMessage = (NetconfMessage) testChunkChannel.readInbound();
-        assertNotNull(receivedMessage);
-        assertTrue(this.msg.getDocument().isEqualNode(receivedMessage.getDocument()));
+    @Test
+    public void testParseChunk() throws IOException, SAXException, DeserializerException, DocumentedException,
+            ParserConfigurationException {
+        final Document msg = XmlFileLoader.xmlFileToDocument("netconfMessages/client_hello.xml");
+        this.parser.setFramingMechanism(FramingMechanism.CHUNK);
+        final byte[] bytes = this.parser.put(new NetconfMessage(msg));
+        final Document doc = this.parser
+                .parse(ByteArray.subByte(bytes, 6, bytes.length - NetconfMessageFactory.endOfChunk.length - 6))
+                .getDocument();
+        assertEquals(XmlUtil.toString(msg), XmlUtil.toString(doc));
+        XMLAssert.assertXMLEqual(msg, doc);
     }
+
 }
index a3377d750157024a85353ab89c11cc08437cea16..fc777bc885ff538d8cf5db829c0e16b1fd0302b7 100644 (file)
@@ -42,6 +42,7 @@
         <dependency>
             <groupId>org.opendaylight.bgpcep</groupId>
             <artifactId>util</artifactId>
+            <version>${bgpcep.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
         <dependency>
             <groupId>org.opendaylight.bgpcep</groupId>
             <artifactId>mockito-configuration</artifactId>
+            <version>${bgpcep.version}</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
index d7f96a876148299d5a09ab765de1e558fbf8cb8e..117735dd1c9268be8f9c39dcc0ab1e1d9c61502c 100644 (file)
@@ -171,7 +171,6 @@ public class NetconfITTest extends AbstractConfigTest {
     protected List<ModuleFactory> getModuleFactories() {
         return getModuleFactoriesS();
     }
-
     static List<ModuleFactory> getModuleFactoriesS() {
         return Lists.newArrayList(new TestImplModuleFactory(), new DepTestImplModuleFactory(),
                 new NetconfTestImplModuleFactory());
index cb198e73612118d3cb38e0d55ccaf741cc42be69..f9b4fddb254f4452d9958d824f8e305ec6221806 100644 (file)
         <dependency>
             <groupId>org.opendaylight.bgpcep</groupId>
             <artifactId>framework</artifactId>
+            <version>${bgpcep.version}</version>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.bgpcep</groupId>
             <artifactId>util</artifactId>
+            <version>${bgpcep.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
         </dependency>
+        <dependency>
+            <groupId>io.netty</groupId>
+            <artifactId>netty-handler</artifactId>
+            <version>${netconf.netty.version}</version>
+        </dependency>
     </dependencies>
 
     <build>
index 029d2ba7595c2a7fabb0f2ec74511fcf8b166184..f7a2eb54cbb6117e62a804f76869b79fca9c1803 100644 (file)
@@ -10,7 +10,9 @@ package org.opendaylight.controller.netconf.util.messages;
 
 import com.google.common.base.Charsets;
 import com.google.common.base.Optional;
-import com.google.common.collect.Lists;
+import io.netty.buffer.Unpooled;
+import io.netty.channel.ChannelHandler;
+import io.netty.handler.codec.DelimiterBasedFrameDecoder;
 import org.opendaylight.controller.netconf.api.NetconfDeserializerException;
 import org.opendaylight.controller.netconf.api.NetconfMessage;
 import org.opendaylight.controller.netconf.util.xml.XmlUtil;
@@ -43,6 +45,8 @@ public final class NetconfMessageFactory implements ProtocolMessageFactory<Netco
 
     public static final int MAX_CHUNK_SIZE = 1024; // Bytes
 
+    private FramingMechanism framing = FramingMechanism.EOM;
+
     private final Optional<String> clientId;
 
     public NetconfMessageFactory() {
@@ -53,8 +57,12 @@ public final class NetconfMessageFactory implements ProtocolMessageFactory<Netco
         this.clientId = clientId;
     }
 
+    public static ChannelHandler getDelimiterFrameDecoder() {
+        return new DelimiterBasedFrameDecoder(Integer.MAX_VALUE, Unpooled.copiedBuffer(endOfMessage));
+    }
+
     @Override
-    public List<NetconfMessage> parse(byte[] bytes) throws DeserializerException, DocumentedException {
+    public NetconfMessage parse(byte[] bytes) throws DeserializerException, DocumentedException {
         String s = Charsets.UTF_8.decode(ByteBuffer.wrap(bytes)).toString();
         logger.debug("Parsing message \n{}", s);
         if (bytes[0] == '[') {
@@ -65,14 +73,14 @@ public final class NetconfMessageFactory implements ProtocolMessageFactory<Netco
                 bytes = Arrays.copyOfRange(bytes, endOfAuthHeader + 2, bytes.length);
             }
         }
-        List<NetconfMessage> messages = Lists.newArrayList();
+        NetconfMessage message = null;
         try {
             Document doc = XmlUtil.readXmlToDocument(new ByteArrayInputStream(bytes));
-            messages.add(new NetconfMessage(doc));
+            message = new NetconfMessage(doc);
         } catch (final SAXException | IOException | IllegalStateException e) {
             throw new NetconfDeserializerException("Could not parse message from " + new String(bytes), e);
         }
-        return messages;
+        return message;
     }
 
     @Override
@@ -81,16 +89,52 @@ public final class NetconfMessageFactory implements ProtocolMessageFactory<Netco
             Comment comment = netconfMessage.getDocument().createComment("clientId:" + clientId.get());
             netconfMessage.getDocument().appendChild(comment);
         }
-        final ByteBuffer msgBytes = Charsets.UTF_8.encode(xmlToString(netconfMessage.getDocument()));
+        byte[] bytes = (this.framing == FramingMechanism.EOM) ? this.putEOM(netconfMessage) : this
+                .putChunked(netconfMessage);
         String content = xmlToString(netconfMessage.getDocument());
 
         logger.trace("Putting message \n{}", content);
-        byte[] b = new byte[msgBytes.remaining()];
-        msgBytes.get(b);
-        return b;
+        return bytes;
+    }
+
+    private byte[] putEOM(NetconfMessage msg) {
+        // create byte buffer from the String XML
+        // all Netconf messages are encoded using UTF-8
+        final ByteBuffer msgBytes = Charsets.UTF_8.encode(xmlToString(msg.getDocument()));
+        final ByteBuffer result = ByteBuffer.allocate(msgBytes.limit() + endOfMessage.length);
+        result.put(msgBytes);
+        // put end of message
+        result.put(endOfMessage);
+        return result.array();
+    }
+
+    private byte[] putChunked(NetconfMessage msg) {
+        final ByteBuffer msgBytes = Charsets.UTF_8.encode(xmlToString(msg.getDocument()));
+        final NetconfMessageHeader h = new NetconfMessageHeader();
+        if (msgBytes.limit() > MAX_CHUNK_SIZE)
+            logger.warn("Netconf message too long, should be split.");
+        h.setLength(msgBytes.limit());
+        final byte[] headerBytes = h.toBytes();
+        final ByteBuffer result = ByteBuffer.allocate(headerBytes.length + msgBytes.limit() + endOfChunk.length);
+        result.put(headerBytes);
+        result.put(msgBytes);
+        result.put(endOfChunk);
+        return result.array();
     }
 
     private String xmlToString(Document doc) {
         return XmlUtil.toString(doc, false);
     }
+
+    /**
+     * For Hello message the framing is always EOM, but the framing mechanism
+     * may change.
+     *
+     * @param fm
+     *            new framing mechanism
+     */
+    public void setFramingMechanism(final FramingMechanism fm) {
+        logger.debug("Framing mechanism changed to {}", fm);
+        this.framing = fm;
+    }
 }
index cff6dfa538582afeb8765aa468591a8089ec4698..1d7d55209466e0f5a4f43b0bcf0bbcc16817cdf4 100644 (file)
@@ -36,6 +36,7 @@
         <slf4j.version>1.7.2</slf4j.version>
         <java.version.source>1.7</java.version.source>
         <java.version.target>1.7</java.version.target>
+        <netconf.netty.version>4.0.10.Final</netconf.netty.version>
     </properties>
 
     <dependencies>