From c3108b4e80ec9f6ee6c8cf96df3009bb91dc8bc0 Mon Sep 17 00:00:00 2001 From: Tomas Olvecky Date: Tue, 13 May 2014 15:26:28 +0200 Subject: [PATCH] Bug 624 - Separate netty and exi specific classes from netconf-util. As preparation step for splitting netconf into service and protocol, create netconf-netty-util bundle with classes dependent on protocol handlers - netty, exi, ssh. Change-Id: I22ba17d0fa4f86c5f64cb3258a55f2c54da85dee Signed-off-by: Tomas Olvecky --- opendaylight/commons/opendaylight/pom.xml | 11 ++ .../distribution/opendaylight/pom.xml | 4 + .../test/sal/binding/it/TestHelper.java | 9 +- .../netconf/NetconfConnectorModule.java | 2 +- .../netconf/api}/NetconfExiSession.java | 4 +- opendaylight/netconf/netconf-client/pom.xml | 6 +- .../netconf/client/NetconfClientSession.java | 16 ++- .../NetconfClientSessionNegotiator.java | 14 +-- ...NetconfClientSessionNegotiatorFactory.java | 2 +- .../client/SshClientChannelInitializer.java | 11 +- .../client/TcpClientChannelInitializer.java | 2 +- .../conf/NetconfClientConfiguration.java | 5 +- .../NetconfClientConfigurationBuilder.java | 5 +- ...etconfReconnectingClientConfiguration.java | 5 +- ...econnectingClientConfigurationBuilder.java | 3 +- opendaylight/netconf/netconf-impl/pom.xml | 15 ++- .../netconf/impl/NetconfServerDispatcher.java | 5 +- .../netconf/impl/NetconfServerSession.java | 18 ++- .../impl/NetconfServerSessionNegotiator.java | 13 +- .../netconf/impl/ConcurrentClientsTest.java | 21 ++-- .../netconf/impl/MessageParserTest.java | 15 ++- opendaylight/netconf/netconf-it/pom.xml | 10 ++ .../netconf/it/NetconfITSecureTest.java | 11 +- .../netconf/netconf-netty-util/pom.xml | 117 ++++++++++++++++++ .../AbstractChannelInitializer.java | 11 +- .../nettyutil}/AbstractNetconfSession.java | 15 ++- .../AbstractNetconfSessionNegotiator.java | 15 ++- .../ChunkedFramingMechanismEncoder.java | 2 +- .../handler/EOMFramingMechanismEncoder.java | 2 +- .../FramingMechanismHandlerFactory.java | 2 +- .../handler/NetconfChunkAggregator.java | 2 +- .../handler/NetconfEOMAggregator.java | 2 +- .../nettyutil}/handler/NetconfEXICodec.java | 2 +- .../handler/NetconfEXIToMessageDecoder.java | 2 +- .../NetconfHelloMessageToXMLEncoder.java | 2 +- .../handler/NetconfMessageToEXIEncoder.java | 2 +- .../handler/NetconfMessageToXMLEncoder.java | 2 +- .../NetconfXMLToHelloMessageDecoder.java | 2 +- .../handler/NetconfXMLToMessageDecoder.java | 2 +- .../nettyutil/handler/exi}/EXIParameters.java | 3 +- .../handler/exi}/NetconfStartExiMessage.java | 2 +- .../nettyutil}/handler/ssh/SshHandler.java | 14 +-- .../authentication/AuthenticationHandler.java | 2 +- .../ssh/authentication/LoginPassword.java | 4 +- .../handler/ssh/client/Invoker.java | 2 +- .../handler/ssh/client/SshClient.java | 6 +- .../handler/ssh/client/SshClientAdapter.java | 4 +- .../handler/ssh/client/SshSession.java | 2 +- .../ssh/virtualsocket/ChannelInputStream.java | 2 +- .../virtualsocket/ChannelOutputStream.java | 2 +- .../ssh/virtualsocket/VirtualSocket.java | 2 +- .../virtualsocket/VirtualSocketException.java | 2 +- .../handler/NetconfChunkAggregatorTest.java | 2 +- .../handler}/NetconfMessageFactoryTest.java | 9 +- .../client_hello_with_auth.xml | 0 opendaylight/netconf/netconf-util/pom.xml | 62 ++-------- .../controller/netconf/util/NetconfUtil.java | 31 ----- opendaylight/netconf/pom.xml | 1 + 58 files changed, 290 insertions(+), 251 deletions(-) rename opendaylight/netconf/{netconf-util/src/main/java/org/opendaylight/controller/netconf/util => netconf-api/src/main/java/org/opendaylight/controller/netconf/api}/NetconfExiSession.java (86%) create mode 100644 opendaylight/netconf/netconf-netty-util/pom.xml rename opendaylight/netconf/{netconf-util/src/main/java/org/opendaylight/controller/netconf/util => netconf-netty-util/src/main/java/org/opendaylight/controller/netconf/nettyutil}/AbstractChannelInitializer.java (85%) rename opendaylight/netconf/{netconf-util/src/main/java/org/opendaylight/controller/netconf/util => netconf-netty-util/src/main/java/org/opendaylight/controller/netconf/nettyutil}/AbstractNetconfSession.java (94%) rename opendaylight/netconf/{netconf-util/src/main/java/org/opendaylight/controller/netconf/util => netconf-netty-util/src/main/java/org/opendaylight/controller/netconf/nettyutil}/AbstractNetconfSessionNegotiator.java (95%) rename opendaylight/netconf/{netconf-util/src/main/java/org/opendaylight/controller/netconf/util => netconf-netty-util/src/main/java/org/opendaylight/controller/netconf/nettyutil}/handler/ChunkedFramingMechanismEncoder.java (97%) rename opendaylight/netconf/{netconf-util/src/main/java/org/opendaylight/controller/netconf/util => netconf-netty-util/src/main/java/org/opendaylight/controller/netconf/nettyutil}/handler/EOMFramingMechanismEncoder.java (92%) rename opendaylight/netconf/{netconf-util/src/main/java/org/opendaylight/controller/netconf/util => netconf-netty-util/src/main/java/org/opendaylight/controller/netconf/nettyutil}/handler/FramingMechanismHandlerFactory.java (94%) rename opendaylight/netconf/{netconf-util/src/main/java/org/opendaylight/controller/netconf/util => netconf-netty-util/src/main/java/org/opendaylight/controller/netconf/nettyutil}/handler/NetconfChunkAggregator.java (99%) rename opendaylight/netconf/{netconf-util/src/main/java/org/opendaylight/controller/netconf/util => netconf-netty-util/src/main/java/org/opendaylight/controller/netconf/nettyutil}/handler/NetconfEOMAggregator.java (97%) rename opendaylight/netconf/{netconf-util/src/main/java/org/opendaylight/controller/netconf/util => netconf-netty-util/src/main/java/org/opendaylight/controller/netconf/nettyutil}/handler/NetconfEXICodec.java (97%) rename opendaylight/netconf/{netconf-util/src/main/java/org/opendaylight/controller/netconf/util => netconf-netty-util/src/main/java/org/opendaylight/controller/netconf/nettyutil}/handler/NetconfEXIToMessageDecoder.java (97%) rename opendaylight/netconf/{netconf-util/src/main/java/org/opendaylight/controller/netconf/util => netconf-netty-util/src/main/java/org/opendaylight/controller/netconf/nettyutil}/handler/NetconfHelloMessageToXMLEncoder.java (97%) rename opendaylight/netconf/{netconf-util/src/main/java/org/opendaylight/controller/netconf/util => netconf-netty-util/src/main/java/org/opendaylight/controller/netconf/nettyutil}/handler/NetconfMessageToEXIEncoder.java (97%) rename opendaylight/netconf/{netconf-util/src/main/java/org/opendaylight/controller/netconf/util => netconf-netty-util/src/main/java/org/opendaylight/controller/netconf/nettyutil}/handler/NetconfMessageToXMLEncoder.java (97%) rename opendaylight/netconf/{netconf-util/src/main/java/org/opendaylight/controller/netconf/util => netconf-netty-util/src/main/java/org/opendaylight/controller/netconf/nettyutil}/handler/NetconfXMLToHelloMessageDecoder.java (99%) rename opendaylight/netconf/{netconf-util/src/main/java/org/opendaylight/controller/netconf/util => netconf-netty-util/src/main/java/org/opendaylight/controller/netconf/nettyutil}/handler/NetconfXMLToMessageDecoder.java (95%) rename opendaylight/netconf/{netconf-util/src/main/java/org/opendaylight/controller/netconf/util/xml => netconf-netty-util/src/main/java/org/opendaylight/controller/netconf/nettyutil/handler/exi}/EXIParameters.java (97%) rename opendaylight/netconf/{netconf-util/src/main/java/org/opendaylight/controller/netconf/util/messages => netconf-netty-util/src/main/java/org/opendaylight/controller/netconf/nettyutil/handler/exi}/NetconfStartExiMessage.java (98%) rename opendaylight/netconf/{netconf-util/src/main/java/org/opendaylight/controller/netconf/util => netconf-netty-util/src/main/java/org/opendaylight/controller/netconf/nettyutil}/handler/ssh/SshHandler.java (80%) rename opendaylight/netconf/{netconf-util/src/main/java/org/opendaylight/controller/netconf/util => netconf-netty-util/src/main/java/org/opendaylight/controller/netconf/nettyutil}/handler/ssh/authentication/AuthenticationHandler.java (87%) rename opendaylight/netconf/{netconf-util/src/main/java/org/opendaylight/controller/netconf/util => netconf-netty-util/src/main/java/org/opendaylight/controller/netconf/nettyutil}/handler/ssh/authentication/LoginPassword.java (86%) rename opendaylight/netconf/{netconf-util/src/main/java/org/opendaylight/controller/netconf/util => netconf-netty-util/src/main/java/org/opendaylight/controller/netconf/nettyutil}/handler/ssh/client/Invoker.java (94%) rename opendaylight/netconf/{netconf-util/src/main/java/org/opendaylight/controller/netconf/util => netconf-netty-util/src/main/java/org/opendaylight/controller/netconf/nettyutil}/handler/ssh/client/SshClient.java (87%) rename opendaylight/netconf/{netconf-util/src/main/java/org/opendaylight/controller/netconf/util => netconf-netty-util/src/main/java/org/opendaylight/controller/netconf/nettyutil}/handler/ssh/client/SshClientAdapter.java (95%) rename opendaylight/netconf/{netconf-util/src/main/java/org/opendaylight/controller/netconf/util => netconf-netty-util/src/main/java/org/opendaylight/controller/netconf/nettyutil}/handler/ssh/client/SshSession.java (96%) rename opendaylight/netconf/{netconf-util/src/main/java/org/opendaylight/controller/netconf/util => netconf-netty-util/src/main/java/org/opendaylight/controller/netconf/nettyutil}/handler/ssh/virtualsocket/ChannelInputStream.java (97%) rename opendaylight/netconf/{netconf-util/src/main/java/org/opendaylight/controller/netconf/util => netconf-netty-util/src/main/java/org/opendaylight/controller/netconf/nettyutil}/handler/ssh/virtualsocket/ChannelOutputStream.java (96%) rename opendaylight/netconf/{netconf-util/src/main/java/org/opendaylight/controller/netconf/util => netconf-netty-util/src/main/java/org/opendaylight/controller/netconf/nettyutil}/handler/ssh/virtualsocket/VirtualSocket.java (98%) rename opendaylight/netconf/{netconf-util/src/main/java/org/opendaylight/controller/netconf/util => netconf-netty-util/src/main/java/org/opendaylight/controller/netconf/nettyutil}/handler/ssh/virtualsocket/VirtualSocketException.java (86%) rename opendaylight/netconf/{netconf-util/src/test/java/org/opendaylight/controller/netconf/util => netconf-netty-util/src/test/java/org/opendaylight/controller/netconf/nettyutil}/handler/NetconfChunkAggregatorTest.java (97%) rename opendaylight/netconf/{netconf-util/src/test/java/org/opendaylight/controller/netconf/util/messages => netconf-netty-util/src/test/java/org/opendaylight/controller/netconf/nettyutil/handler}/NetconfMessageFactoryTest.java (87%) rename opendaylight/netconf/{netconf-util => netconf-netty-util}/src/test/resources/netconfMessages/client_hello_with_auth.xml (100%) diff --git a/opendaylight/commons/opendaylight/pom.xml b/opendaylight/commons/opendaylight/pom.xml index aaab66d4b0..2e4303eeb7 100644 --- a/opendaylight/commons/opendaylight/pom.xml +++ b/opendaylight/commons/opendaylight/pom.xml @@ -187,6 +187,17 @@ ietf-netconf-monitoring-extension ${netconf.version} + + ${project.groupId} + netconf-netty-util + ${netconf.version} + + + org.opendaylight.controller + netconf-netty-util + ${netconf.version} + test-jar + ch.qos.logback logback-classic diff --git a/opendaylight/distribution/opendaylight/pom.xml b/opendaylight/distribution/opendaylight/pom.xml index 72ce89d14e..04818e78c6 100644 --- a/opendaylight/distribution/opendaylight/pom.xml +++ b/opendaylight/distribution/opendaylight/pom.xml @@ -894,6 +894,10 @@ org.opendaylight.controller netconf-monitoring + + org.opendaylight.controller + netconf-netty-util + org.opendaylight.controller netconf-ssh diff --git a/opendaylight/md-sal/sal-binding-it/src/main/java/org/opendaylight/controller/test/sal/binding/it/TestHelper.java b/opendaylight/md-sal/sal-binding-it/src/main/java/org/opendaylight/controller/test/sal/binding/it/TestHelper.java index 734733a19c..57b4960145 100644 --- a/opendaylight/md-sal/sal-binding-it/src/main/java/org/opendaylight/controller/test/sal/binding/it/TestHelper.java +++ b/opendaylight/md-sal/sal-binding-it/src/main/java/org/opendaylight/controller/test/sal/binding/it/TestHelper.java @@ -7,15 +7,15 @@ */ package org.opendaylight.controller.test.sal.binding.it; -import org.ops4j.pax.exam.Option; -import org.ops4j.pax.exam.options.DefaultCompositeOption; -import org.ops4j.pax.exam.util.PathUtils; - import static org.ops4j.pax.exam.CoreOptions.frameworkProperty; import static org.ops4j.pax.exam.CoreOptions.junitBundles; import static org.ops4j.pax.exam.CoreOptions.mavenBundle; import static org.ops4j.pax.exam.CoreOptions.systemProperty; +import org.ops4j.pax.exam.Option; +import org.ops4j.pax.exam.options.DefaultCompositeOption; +import org.ops4j.pax.exam.util.PathUtils; + public class TestHelper { public static final String CONTROLLER = "org.opendaylight.controller"; @@ -68,6 +68,7 @@ public class TestHelper { mavenBundle(CONTROLLER, "netconf-client").versionAsInProject(), // mavenBundle(CONTROLLER, "netconf-util").versionAsInProject(), // + mavenBundle(CONTROLLER, "netconf-netty-util").versionAsInProject(), // mavenBundle("org.openexi", "nagasena").versionAsInProject(), // mavenBundle("org.openexi", "nagasena-rta").versionAsInProject(), // mavenBundle(CONTROLLER + ".thirdparty", "ganymed").versionAsInProject(), // diff --git a/opendaylight/md-sal/sal-netconf-connector/src/main/java/org/opendaylight/controller/config/yang/md/sal/connector/netconf/NetconfConnectorModule.java b/opendaylight/md-sal/sal-netconf-connector/src/main/java/org/opendaylight/controller/config/yang/md/sal/connector/netconf/NetconfConnectorModule.java index de3c18db69..89274c9ad5 100644 --- a/opendaylight/md-sal/sal-netconf-connector/src/main/java/org/opendaylight/controller/config/yang/md/sal/connector/netconf/NetconfConnectorModule.java +++ b/opendaylight/md-sal/sal-netconf-connector/src/main/java/org/opendaylight/controller/config/yang/md/sal/connector/netconf/NetconfConnectorModule.java @@ -25,7 +25,7 @@ import org.opendaylight.controller.netconf.client.conf.NetconfClientConfiguratio import org.opendaylight.controller.netconf.client.conf.NetconfClientConfigurationBuilder; import org.opendaylight.controller.netconf.client.conf.NetconfReconnectingClientConfiguration; import org.opendaylight.controller.netconf.client.conf.NetconfReconnectingClientConfigurationBuilder; -import org.opendaylight.controller.netconf.util.handler.ssh.authentication.LoginPassword; +import org.opendaylight.controller.netconf.nettyutil.handler.ssh.authentication.LoginPassword; import org.opendaylight.controller.sal.binding.api.data.DataProviderService; import org.opendaylight.controller.sal.connect.netconf.NetconfDevice; import org.opendaylight.controller.sal.connect.netconf.NetconfDeviceListener; diff --git a/opendaylight/netconf/netconf-util/src/main/java/org/opendaylight/controller/netconf/util/NetconfExiSession.java b/opendaylight/netconf/netconf-api/src/main/java/org/opendaylight/controller/netconf/api/NetconfExiSession.java similarity index 86% rename from opendaylight/netconf/netconf-util/src/main/java/org/opendaylight/controller/netconf/util/NetconfExiSession.java rename to opendaylight/netconf/netconf-api/src/main/java/org/opendaylight/controller/netconf/api/NetconfExiSession.java index 2a20ba2f61..66510b42d1 100644 --- a/opendaylight/netconf/netconf-util/src/main/java/org/opendaylight/controller/netconf/util/NetconfExiSession.java +++ b/opendaylight/netconf/netconf-api/src/main/java/org/opendaylight/controller/netconf/api/NetconfExiSession.java @@ -5,9 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.controller.netconf.util; - -import org.opendaylight.controller.netconf.api.NetconfMessage; +package org.opendaylight.controller.netconf.api; /** * Session capable of exi communication according to http://tools.ietf.org/html/draft-varga-netconf-exi-capability-02 diff --git a/opendaylight/netconf/netconf-client/pom.xml b/opendaylight/netconf/netconf-client/pom.xml index ce77fdc08e..f46d149033 100644 --- a/opendaylight/netconf/netconf-client/pom.xml +++ b/opendaylight/netconf/netconf-client/pom.xml @@ -16,6 +16,10 @@ ${project.groupId} netconf-api + + ${project.groupId} + netconf-netty-util + ${project.groupId} netconf-util @@ -54,8 +58,8 @@ javax.xml.parsers, javax.xml.xpath, org.opendaylight.controller.netconf.api, - org.opendaylight.controller.netconf.util, org.opendaylight.controller.netconf.util.*, + org.opendaylight.controller.netconf.nettyutil.*, org.opendaylight.protocol.framework, org.openexi.*, org.slf4j, diff --git a/opendaylight/netconf/netconf-client/src/main/java/org/opendaylight/controller/netconf/client/NetconfClientSession.java b/opendaylight/netconf/netconf-client/src/main/java/org/opendaylight/controller/netconf/client/NetconfClientSession.java index f4efb1fc7d..eaa3589e66 100644 --- a/opendaylight/netconf/netconf-client/src/main/java/org/opendaylight/controller/netconf/client/NetconfClientSession.java +++ b/opendaylight/netconf/netconf-client/src/main/java/org/opendaylight/controller/netconf/client/NetconfClientSession.java @@ -8,19 +8,17 @@ package org.opendaylight.controller.netconf.client; +import io.netty.channel.Channel; import java.util.Collection; - -import org.opendaylight.controller.netconf.util.AbstractNetconfSession; -import org.opendaylight.controller.netconf.util.handler.NetconfEXICodec; -import org.opendaylight.controller.netconf.util.handler.NetconfEXIToMessageDecoder; -import org.opendaylight.controller.netconf.util.handler.NetconfMessageToEXIEncoder; -import org.opendaylight.controller.netconf.util.handler.NetconfMessageToXMLEncoder; -import org.opendaylight.controller.netconf.util.handler.NetconfXMLToMessageDecoder; +import org.opendaylight.controller.netconf.nettyutil.AbstractNetconfSession; +import org.opendaylight.controller.netconf.nettyutil.handler.NetconfEXICodec; +import org.opendaylight.controller.netconf.nettyutil.handler.NetconfEXIToMessageDecoder; +import org.opendaylight.controller.netconf.nettyutil.handler.NetconfMessageToEXIEncoder; +import org.opendaylight.controller.netconf.nettyutil.handler.NetconfMessageToXMLEncoder; +import org.opendaylight.controller.netconf.nettyutil.handler.NetconfXMLToMessageDecoder; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import io.netty.channel.Channel; - public final class NetconfClientSession extends AbstractNetconfSession { private static final Logger logger = LoggerFactory.getLogger(NetconfClientSession.class); diff --git a/opendaylight/netconf/netconf-client/src/main/java/org/opendaylight/controller/netconf/client/NetconfClientSessionNegotiator.java b/opendaylight/netconf/netconf-client/src/main/java/org/opendaylight/controller/netconf/client/NetconfClientSessionNegotiator.java index 4e2393171a..bb6ea61a25 100644 --- a/opendaylight/netconf/netconf-client/src/main/java/org/opendaylight/controller/netconf/client/NetconfClientSessionNegotiator.java +++ b/opendaylight/netconf/netconf-client/src/main/java/org/opendaylight/controller/netconf/client/NetconfClientSessionNegotiator.java @@ -8,22 +8,24 @@ package org.opendaylight.controller.netconf.client; +import io.netty.channel.Channel; import io.netty.channel.ChannelFuture; import io.netty.channel.ChannelFutureListener; import io.netty.channel.ChannelHandlerContext; import io.netty.channel.ChannelInboundHandlerAdapter; +import io.netty.util.Timer; +import io.netty.util.concurrent.Promise; import java.util.Collection; import javax.xml.xpath.XPathConstants; import javax.xml.xpath.XPathExpression; - import org.opendaylight.controller.netconf.api.NetconfClientSessionPreferences; import org.opendaylight.controller.netconf.api.NetconfDocumentedException; import org.opendaylight.controller.netconf.api.NetconfMessage; -import org.opendaylight.controller.netconf.util.AbstractChannelInitializer; -import org.opendaylight.controller.netconf.util.AbstractNetconfSessionNegotiator; +import org.opendaylight.controller.netconf.nettyutil.AbstractChannelInitializer; +import org.opendaylight.controller.netconf.nettyutil.AbstractNetconfSessionNegotiator; +import org.opendaylight.controller.netconf.nettyutil.handler.exi.NetconfStartExiMessage; import org.opendaylight.controller.netconf.util.messages.NetconfHelloMessage; import org.opendaylight.controller.netconf.util.messages.NetconfMessageUtil; -import org.opendaylight.controller.netconf.util.messages.NetconfStartExiMessage; import org.opendaylight.controller.netconf.util.xml.XMLNetconfUtil; import org.opendaylight.controller.netconf.util.xml.XmlNetconfConstants; import org.opendaylight.controller.netconf.util.xml.XmlUtil; @@ -33,10 +35,6 @@ import org.w3c.dom.Document; import org.w3c.dom.Node; import org.w3c.dom.NodeList; -import io.netty.channel.Channel; -import io.netty.util.Timer; -import io.netty.util.concurrent.Promise; - public class NetconfClientSessionNegotiator extends AbstractNetconfSessionNegotiator { diff --git a/opendaylight/netconf/netconf-client/src/main/java/org/opendaylight/controller/netconf/client/NetconfClientSessionNegotiatorFactory.java b/opendaylight/netconf/netconf-client/src/main/java/org/opendaylight/controller/netconf/client/NetconfClientSessionNegotiatorFactory.java index e65adc3fdf..4c993acf58 100644 --- a/opendaylight/netconf/netconf-client/src/main/java/org/opendaylight/controller/netconf/client/NetconfClientSessionNegotiatorFactory.java +++ b/opendaylight/netconf/netconf-client/src/main/java/org/opendaylight/controller/netconf/client/NetconfClientSessionNegotiatorFactory.java @@ -17,9 +17,9 @@ import io.netty.util.concurrent.Promise; import org.opendaylight.controller.netconf.api.NetconfClientSessionPreferences; import org.opendaylight.controller.netconf.api.NetconfDocumentedException; import org.opendaylight.controller.netconf.api.NetconfMessage; +import org.opendaylight.controller.netconf.nettyutil.handler.exi.NetconfStartExiMessage; import org.opendaylight.controller.netconf.util.messages.NetconfHelloMessage; import org.opendaylight.controller.netconf.util.messages.NetconfHelloMessageAdditionalHeader; -import org.opendaylight.controller.netconf.util.messages.NetconfStartExiMessage; import org.opendaylight.controller.netconf.util.xml.XmlNetconfConstants; import org.opendaylight.protocol.framework.SessionListenerFactory; import org.opendaylight.protocol.framework.SessionNegotiator; diff --git a/opendaylight/netconf/netconf-client/src/main/java/org/opendaylight/controller/netconf/client/SshClientChannelInitializer.java b/opendaylight/netconf/netconf-client/src/main/java/org/opendaylight/controller/netconf/client/SshClientChannelInitializer.java index b86349ddea..799674487f 100644 --- a/opendaylight/netconf/netconf-client/src/main/java/org/opendaylight/controller/netconf/client/SshClientChannelInitializer.java +++ b/opendaylight/netconf/netconf-client/src/main/java/org/opendaylight/controller/netconf/client/SshClientChannelInitializer.java @@ -9,13 +9,12 @@ package org.opendaylight.controller.netconf.client; import io.netty.channel.socket.SocketChannel; import io.netty.util.concurrent.Promise; -import org.opendaylight.controller.netconf.util.AbstractChannelInitializer; -import org.opendaylight.controller.netconf.util.handler.ssh.SshHandler; -import org.opendaylight.controller.netconf.util.handler.ssh.authentication.AuthenticationHandler; -import org.opendaylight.controller.netconf.util.handler.ssh.client.Invoker; -import org.opendaylight.protocol.framework.SessionListenerFactory; - import java.io.IOException; +import org.opendaylight.controller.netconf.nettyutil.AbstractChannelInitializer; +import org.opendaylight.controller.netconf.nettyutil.handler.ssh.SshHandler; +import org.opendaylight.controller.netconf.nettyutil.handler.ssh.authentication.AuthenticationHandler; +import org.opendaylight.controller.netconf.nettyutil.handler.ssh.client.Invoker; +import org.opendaylight.protocol.framework.SessionListenerFactory; final class SshClientChannelInitializer extends AbstractChannelInitializer { diff --git a/opendaylight/netconf/netconf-client/src/main/java/org/opendaylight/controller/netconf/client/TcpClientChannelInitializer.java b/opendaylight/netconf/netconf-client/src/main/java/org/opendaylight/controller/netconf/client/TcpClientChannelInitializer.java index 967d3c6dfb..4a0a089fae 100644 --- a/opendaylight/netconf/netconf-client/src/main/java/org/opendaylight/controller/netconf/client/TcpClientChannelInitializer.java +++ b/opendaylight/netconf/netconf-client/src/main/java/org/opendaylight/controller/netconf/client/TcpClientChannelInitializer.java @@ -9,7 +9,7 @@ package org.opendaylight.controller.netconf.client; import io.netty.channel.socket.SocketChannel; import io.netty.util.concurrent.Promise; -import org.opendaylight.controller.netconf.util.AbstractChannelInitializer; +import org.opendaylight.controller.netconf.nettyutil.AbstractChannelInitializer; import org.opendaylight.protocol.framework.SessionListenerFactory; class TcpClientChannelInitializer extends AbstractChannelInitializer { diff --git a/opendaylight/netconf/netconf-client/src/main/java/org/opendaylight/controller/netconf/client/conf/NetconfClientConfiguration.java b/opendaylight/netconf/netconf-client/src/main/java/org/opendaylight/controller/netconf/client/conf/NetconfClientConfiguration.java index 5a3ec3a23e..37dae69f35 100644 --- a/opendaylight/netconf/netconf-client/src/main/java/org/opendaylight/controller/netconf/client/conf/NetconfClientConfiguration.java +++ b/opendaylight/netconf/netconf-client/src/main/java/org/opendaylight/controller/netconf/client/conf/NetconfClientConfiguration.java @@ -10,13 +10,12 @@ package org.opendaylight.controller.netconf.client.conf; import com.google.common.base.Objects; import com.google.common.base.Optional; import com.google.common.base.Preconditions; +import java.net.InetSocketAddress; import org.opendaylight.controller.netconf.client.NetconfClientSessionListener; -import org.opendaylight.controller.netconf.util.handler.ssh.authentication.AuthenticationHandler; +import org.opendaylight.controller.netconf.nettyutil.handler.ssh.authentication.AuthenticationHandler; import org.opendaylight.controller.netconf.util.messages.NetconfHelloMessageAdditionalHeader; import org.opendaylight.protocol.framework.ReconnectStrategy; -import java.net.InetSocketAddress; - public class NetconfClientConfiguration { private final NetconfClientProtocol clientProtocol; diff --git a/opendaylight/netconf/netconf-client/src/main/java/org/opendaylight/controller/netconf/client/conf/NetconfClientConfigurationBuilder.java b/opendaylight/netconf/netconf-client/src/main/java/org/opendaylight/controller/netconf/client/conf/NetconfClientConfigurationBuilder.java index a3e57bd9d3..b477beea66 100644 --- a/opendaylight/netconf/netconf-client/src/main/java/org/opendaylight/controller/netconf/client/conf/NetconfClientConfigurationBuilder.java +++ b/opendaylight/netconf/netconf-client/src/main/java/org/opendaylight/controller/netconf/client/conf/NetconfClientConfigurationBuilder.java @@ -7,13 +7,12 @@ */ package org.opendaylight.controller.netconf.client.conf; +import java.net.InetSocketAddress; import org.opendaylight.controller.netconf.client.NetconfClientSessionListener; -import org.opendaylight.controller.netconf.util.handler.ssh.authentication.AuthenticationHandler; +import org.opendaylight.controller.netconf.nettyutil.handler.ssh.authentication.AuthenticationHandler; import org.opendaylight.controller.netconf.util.messages.NetconfHelloMessageAdditionalHeader; import org.opendaylight.protocol.framework.ReconnectStrategy; -import java.net.InetSocketAddress; - public class NetconfClientConfigurationBuilder { public static final int DEFAULT_CONNECTION_TIMEOUT_MILLIS = 5000; diff --git a/opendaylight/netconf/netconf-client/src/main/java/org/opendaylight/controller/netconf/client/conf/NetconfReconnectingClientConfiguration.java b/opendaylight/netconf/netconf-client/src/main/java/org/opendaylight/controller/netconf/client/conf/NetconfReconnectingClientConfiguration.java index 64fcc48b25..f618ea5ab9 100644 --- a/opendaylight/netconf/netconf-client/src/main/java/org/opendaylight/controller/netconf/client/conf/NetconfReconnectingClientConfiguration.java +++ b/opendaylight/netconf/netconf-client/src/main/java/org/opendaylight/controller/netconf/client/conf/NetconfReconnectingClientConfiguration.java @@ -9,14 +9,13 @@ package org.opendaylight.controller.netconf.client.conf; import com.google.common.base.Objects; import com.google.common.base.Preconditions; +import java.net.InetSocketAddress; import org.opendaylight.controller.netconf.client.NetconfClientSessionListener; -import org.opendaylight.controller.netconf.util.handler.ssh.authentication.AuthenticationHandler; +import org.opendaylight.controller.netconf.nettyutil.handler.ssh.authentication.AuthenticationHandler; import org.opendaylight.controller.netconf.util.messages.NetconfHelloMessageAdditionalHeader; import org.opendaylight.protocol.framework.ReconnectStrategy; import org.opendaylight.protocol.framework.ReconnectStrategyFactory; -import java.net.InetSocketAddress; - public final class NetconfReconnectingClientConfiguration extends NetconfClientConfiguration { private final ReconnectStrategyFactory connectStrategyFactory; diff --git a/opendaylight/netconf/netconf-client/src/main/java/org/opendaylight/controller/netconf/client/conf/NetconfReconnectingClientConfigurationBuilder.java b/opendaylight/netconf/netconf-client/src/main/java/org/opendaylight/controller/netconf/client/conf/NetconfReconnectingClientConfigurationBuilder.java index 411ac3c23d..f0f972b945 100644 --- a/opendaylight/netconf/netconf-client/src/main/java/org/opendaylight/controller/netconf/client/conf/NetconfReconnectingClientConfigurationBuilder.java +++ b/opendaylight/netconf/netconf-client/src/main/java/org/opendaylight/controller/netconf/client/conf/NetconfReconnectingClientConfigurationBuilder.java @@ -8,9 +8,8 @@ package org.opendaylight.controller.netconf.client.conf; import java.net.InetSocketAddress; - import org.opendaylight.controller.netconf.client.NetconfClientSessionListener; -import org.opendaylight.controller.netconf.util.handler.ssh.authentication.AuthenticationHandler; +import org.opendaylight.controller.netconf.nettyutil.handler.ssh.authentication.AuthenticationHandler; import org.opendaylight.controller.netconf.util.messages.NetconfHelloMessageAdditionalHeader; import org.opendaylight.protocol.framework.ReconnectStrategy; import org.opendaylight.protocol.framework.ReconnectStrategyFactory; diff --git a/opendaylight/netconf/netconf-impl/pom.xml b/opendaylight/netconf/netconf-impl/pom.xml index c62a85aae6..1d94517152 100644 --- a/opendaylight/netconf/netconf-impl/pom.xml +++ b/opendaylight/netconf/netconf-impl/pom.xml @@ -30,6 +30,10 @@ ${project.groupId} netconf-mapping-api + + ${project.groupId} + netconf-netty-util + ${project.groupId} netconf-util @@ -125,19 +129,13 @@ org.opendaylight.controller.netconf.api, org.opendaylight.controller.netconf.api.jmx, org.opendaylight.controller.netconf.mapping.api, - org.opendaylight.controller.netconf.util, - org.opendaylight.controller.netconf.util.mapping, - org.opendaylight.controller.netconf.util.osgi, - org.opendaylight.controller.netconf.util.xml, - org.opendaylight.controller.netconf.util.exception, - org.opendaylight.controller.netconf.util.handler, + org.opendaylight.controller.netconf.util.*, org.opendaylight.protocol.framework, org.osgi.framework, org.osgi.util.tracker, org.slf4j, org.w3c.dom, org.xml.sax, - org.opendaylight.controller.netconf.util.messages, io.netty.util.internal, org.opendaylight.controller.netconf.api.monitoring, org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev100924, @@ -148,7 +146,8 @@ org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.netconf.monitoring.rev101004.netconf.state.schemas, org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.netconf.monitoring.extension.rev131210, org.opendaylight.yangtools.yang.binding, - org.openexi.*, + org.openexi.*, + org.opendaylight.controller.netconf.nettyutil.* diff --git a/opendaylight/netconf/netconf-impl/src/main/java/org/opendaylight/controller/netconf/impl/NetconfServerDispatcher.java b/opendaylight/netconf/netconf-impl/src/main/java/org/opendaylight/controller/netconf/impl/NetconfServerDispatcher.java index 130818b12a..de3dee1443 100644 --- a/opendaylight/netconf/netconf-impl/src/main/java/org/opendaylight/controller/netconf/impl/NetconfServerDispatcher.java +++ b/opendaylight/netconf/netconf-impl/src/main/java/org/opendaylight/controller/netconf/impl/NetconfServerDispatcher.java @@ -12,12 +12,11 @@ import io.netty.channel.ChannelFuture; import io.netty.channel.EventLoopGroup; import io.netty.channel.socket.SocketChannel; import io.netty.util.concurrent.Promise; +import java.net.InetSocketAddress; import org.opendaylight.controller.netconf.impl.util.DeserializerExceptionHandler; -import org.opendaylight.controller.netconf.util.AbstractChannelInitializer; +import org.opendaylight.controller.netconf.nettyutil.AbstractChannelInitializer; import org.opendaylight.protocol.framework.AbstractDispatcher; -import java.net.InetSocketAddress; - public class NetconfServerDispatcher extends AbstractDispatcher { private final ServerChannelInitializer initializer; diff --git a/opendaylight/netconf/netconf-impl/src/main/java/org/opendaylight/controller/netconf/impl/NetconfServerSession.java b/opendaylight/netconf/netconf-impl/src/main/java/org/opendaylight/controller/netconf/impl/NetconfServerSession.java index 280375d918..7d409092b9 100644 --- a/opendaylight/netconf/netconf-impl/src/main/java/org/opendaylight/controller/netconf/impl/NetconfServerSession.java +++ b/opendaylight/netconf/netconf-impl/src/main/java/org/opendaylight/controller/netconf/impl/NetconfServerSession.java @@ -8,18 +8,19 @@ package org.opendaylight.controller.netconf.impl; +import com.google.common.base.Preconditions; +import io.netty.channel.Channel; import java.text.SimpleDateFormat; import java.util.Date; import java.util.regex.Matcher; import java.util.regex.Pattern; - import org.opendaylight.controller.netconf.api.monitoring.NetconfManagementSession; -import org.opendaylight.controller.netconf.util.AbstractNetconfSession; -import org.opendaylight.controller.netconf.util.handler.NetconfEXICodec; -import org.opendaylight.controller.netconf.util.handler.NetconfEXIToMessageDecoder; -import org.opendaylight.controller.netconf.util.handler.NetconfMessageToEXIEncoder; -import org.opendaylight.controller.netconf.util.handler.NetconfMessageToXMLEncoder; -import org.opendaylight.controller.netconf.util.handler.NetconfXMLToMessageDecoder; +import org.opendaylight.controller.netconf.nettyutil.AbstractNetconfSession; +import org.opendaylight.controller.netconf.nettyutil.handler.NetconfEXICodec; +import org.opendaylight.controller.netconf.nettyutil.handler.NetconfEXIToMessageDecoder; +import org.opendaylight.controller.netconf.nettyutil.handler.NetconfMessageToEXIEncoder; +import org.opendaylight.controller.netconf.nettyutil.handler.NetconfMessageToXMLEncoder; +import org.opendaylight.controller.netconf.nettyutil.handler.NetconfXMLToMessageDecoder; import org.opendaylight.controller.netconf.util.messages.NetconfHelloMessageAdditionalHeader; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev100924.DomainName; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev100924.Host; @@ -36,9 +37,6 @@ import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types. import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.google.common.base.Preconditions; -import io.netty.channel.Channel; - public final class NetconfServerSession extends AbstractNetconfSession implements NetconfManagementSession { private static final Logger logger = LoggerFactory.getLogger(NetconfServerSession.class); diff --git a/opendaylight/netconf/netconf-impl/src/main/java/org/opendaylight/controller/netconf/impl/NetconfServerSessionNegotiator.java b/opendaylight/netconf/netconf-impl/src/main/java/org/opendaylight/controller/netconf/impl/NetconfServerSessionNegotiator.java index 6528fe2517..a48cbbe241 100644 --- a/opendaylight/netconf/netconf-impl/src/main/java/org/opendaylight/controller/netconf/impl/NetconfServerSessionNegotiator.java +++ b/opendaylight/netconf/netconf-impl/src/main/java/org/opendaylight/controller/netconf/impl/NetconfServerSessionNegotiator.java @@ -8,22 +8,19 @@ package org.opendaylight.controller.netconf.impl; +import com.google.common.base.Optional; +import io.netty.channel.Channel; +import io.netty.util.Timer; +import io.netty.util.concurrent.Promise; import java.net.InetSocketAddress; - import org.opendaylight.controller.netconf.api.NetconfDocumentedException; import org.opendaylight.controller.netconf.api.NetconfServerSessionPreferences; -import org.opendaylight.controller.netconf.util.AbstractNetconfSessionNegotiator; +import org.opendaylight.controller.netconf.nettyutil.AbstractNetconfSessionNegotiator; import org.opendaylight.controller.netconf.util.messages.NetconfHelloMessage; import org.opendaylight.controller.netconf.util.messages.NetconfHelloMessageAdditionalHeader; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.google.common.base.Optional; - -import io.netty.channel.Channel; -import io.netty.util.Timer; -import io.netty.util.concurrent.Promise; - public class NetconfServerSessionNegotiator extends AbstractNetconfSessionNegotiator { diff --git a/opendaylight/netconf/netconf-impl/src/test/java/org/opendaylight/controller/netconf/impl/ConcurrentClientsTest.java b/opendaylight/netconf/netconf-impl/src/test/java/org/opendaylight/controller/netconf/impl/ConcurrentClientsTest.java index b8622d1e91..ea2bb9c34e 100644 --- a/opendaylight/netconf/netconf-impl/src/test/java/org/opendaylight/controller/netconf/impl/ConcurrentClientsTest.java +++ b/opendaylight/netconf/netconf-impl/src/test/java/org/opendaylight/controller/netconf/impl/ConcurrentClientsTest.java @@ -15,6 +15,14 @@ import static org.mockito.Matchers.any; import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.mock; +import com.google.common.base.Preconditions; +import com.google.common.collect.Lists; +import com.google.common.collect.Sets; +import io.netty.channel.ChannelFuture; +import io.netty.channel.EventLoopGroup; +import io.netty.channel.nio.NioEventLoopGroup; +import io.netty.util.HashedWheelTimer; +import io.netty.util.concurrent.GlobalEventExecutor; import java.io.DataOutputStream; import java.io.InputStream; import java.io.InputStreamReader; @@ -32,7 +40,6 @@ import java.util.concurrent.Executors; import java.util.concurrent.Future; import java.util.concurrent.ThreadFactory; import java.util.concurrent.atomic.AtomicLong; - import org.apache.commons.io.IOUtils; import org.junit.After; import org.junit.AfterClass; @@ -57,9 +64,9 @@ import org.opendaylight.controller.netconf.mapping.api.NetconfOperation; import org.opendaylight.controller.netconf.mapping.api.NetconfOperationChainedExecution; import org.opendaylight.controller.netconf.mapping.api.NetconfOperationService; import org.opendaylight.controller.netconf.mapping.api.NetconfOperationServiceFactory; +import org.opendaylight.controller.netconf.nettyutil.handler.exi.NetconfStartExiMessage; import org.opendaylight.controller.netconf.util.messages.NetconfHelloMessageAdditionalHeader; import org.opendaylight.controller.netconf.util.messages.NetconfMessageUtil; -import org.opendaylight.controller.netconf.util.messages.NetconfStartExiMessage; import org.opendaylight.controller.netconf.util.test.XmlFileLoader; import org.opendaylight.controller.netconf.util.xml.XmlNetconfConstants; import org.opendaylight.controller.netconf.util.xml.XmlUtil; @@ -68,16 +75,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.w3c.dom.Document; -import com.google.common.base.Preconditions; -import com.google.common.collect.Lists; -import com.google.common.collect.Sets; - -import io.netty.channel.ChannelFuture; -import io.netty.channel.EventLoopGroup; -import io.netty.channel.nio.NioEventLoopGroup; -import io.netty.util.HashedWheelTimer; -import io.netty.util.concurrent.GlobalEventExecutor; - @RunWith(Parameterized.class) public class ConcurrentClientsTest { private static final Logger logger = LoggerFactory.getLogger(ConcurrentClientsTest.class); diff --git a/opendaylight/netconf/netconf-impl/src/test/java/org/opendaylight/controller/netconf/impl/MessageParserTest.java b/opendaylight/netconf/netconf-impl/src/test/java/org/opendaylight/controller/netconf/impl/MessageParserTest.java index e13415b64b..abf2ad862f 100644 --- a/opendaylight/netconf/netconf-impl/src/test/java/org/opendaylight/controller/netconf/impl/MessageParserTest.java +++ b/opendaylight/netconf/netconf-impl/src/test/java/org/opendaylight/controller/netconf/impl/MessageParserTest.java @@ -14,21 +14,20 @@ 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 io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; import io.netty.channel.embedded.EmbeddedChannel; - import java.util.Queue; - import org.junit.Before; import org.junit.Test; import org.opendaylight.controller.netconf.api.NetconfMessage; -import org.opendaylight.controller.netconf.util.handler.ChunkedFramingMechanismEncoder; -import org.opendaylight.controller.netconf.util.handler.FramingMechanismHandlerFactory; -import org.opendaylight.controller.netconf.util.handler.NetconfChunkAggregator; -import org.opendaylight.controller.netconf.util.handler.NetconfEOMAggregator; -import org.opendaylight.controller.netconf.util.handler.NetconfMessageToXMLEncoder; -import org.opendaylight.controller.netconf.util.handler.NetconfXMLToMessageDecoder; +import org.opendaylight.controller.netconf.nettyutil.handler.ChunkedFramingMechanismEncoder; +import org.opendaylight.controller.netconf.nettyutil.handler.FramingMechanismHandlerFactory; +import org.opendaylight.controller.netconf.nettyutil.handler.NetconfChunkAggregator; +import org.opendaylight.controller.netconf.nettyutil.handler.NetconfEOMAggregator; +import org.opendaylight.controller.netconf.nettyutil.handler.NetconfMessageToXMLEncoder; +import org.opendaylight.controller.netconf.nettyutil.handler.NetconfXMLToMessageDecoder; import org.opendaylight.controller.netconf.util.messages.FramingMechanism; import org.opendaylight.controller.netconf.util.messages.NetconfMessageConstants; import org.opendaylight.controller.netconf.util.messages.NetconfMessageHeader; diff --git a/opendaylight/netconf/netconf-it/pom.xml b/opendaylight/netconf/netconf-it/pom.xml index 66106075d3..c40dfe7fc3 100644 --- a/opendaylight/netconf/netconf-it/pom.xml +++ b/opendaylight/netconf/netconf-it/pom.xml @@ -15,6 +15,10 @@ + + ${project.groupId} + netconf-netty-util + org.opendaylight.controller commons.logback_settings @@ -105,6 +109,12 @@ netconf-monitoring test + + ${project.groupId} + netconf-netty-util + test-jar + test + ${project.groupId} netconf-ssh diff --git a/opendaylight/netconf/netconf-it/src/test/java/org/opendaylight/controller/netconf/it/NetconfITSecureTest.java b/opendaylight/netconf/netconf-it/src/test/java/org/opendaylight/controller/netconf/it/NetconfITSecureTest.java index 4dc4b707d4..140284e4ee 100644 --- a/opendaylight/netconf/netconf-it/src/test/java/org/opendaylight/controller/netconf/it/NetconfITSecureTest.java +++ b/opendaylight/netconf/netconf-it/src/test/java/org/opendaylight/controller/netconf/it/NetconfITSecureTest.java @@ -14,6 +14,9 @@ import static org.mockito.Mockito.doAnswer; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; +import ch.ethz.ssh2.Connection; +import io.netty.channel.ChannelFuture; +import io.netty.util.concurrent.GlobalEventExecutor; import java.io.File; import java.io.IOException; import java.io.InputStream; @@ -22,9 +25,7 @@ import java.net.InetSocketAddress; import java.nio.file.Files; import java.util.Collection; import java.util.List; - import junit.framework.Assert; - import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -44,10 +45,10 @@ import org.opendaylight.controller.netconf.confignetconfconnector.osgi.YangStore import org.opendaylight.controller.netconf.impl.DefaultCommitNotificationProducer; import org.opendaylight.controller.netconf.impl.NetconfServerDispatcher; import org.opendaylight.controller.netconf.impl.osgi.NetconfOperationServiceFactoryListenerImpl; +import org.opendaylight.controller.netconf.nettyutil.handler.ssh.authentication.AuthenticationHandler; import org.opendaylight.controller.netconf.ssh.NetconfSSHServer; import org.opendaylight.controller.netconf.ssh.authentication.AuthProvider; import org.opendaylight.controller.netconf.ssh.authentication.PEMGenerator; -import org.opendaylight.controller.netconf.util.handler.ssh.authentication.AuthenticationHandler; import org.opendaylight.controller.netconf.util.messages.NetconfMessageUtil; import org.opendaylight.controller.netconf.util.test.XmlFileLoader; import org.opendaylight.controller.netconf.util.xml.XmlUtil; @@ -55,10 +56,6 @@ import org.opendaylight.controller.sal.authorization.AuthResultEnum; import org.opendaylight.controller.usermanager.IUserManager; import org.opendaylight.protocol.framework.NeverReconnectStrategy; -import ch.ethz.ssh2.Connection; -import io.netty.channel.ChannelFuture; -import io.netty.util.concurrent.GlobalEventExecutor; - public class NetconfITSecureTest extends AbstractNetconfConfigTest { private static final InetSocketAddress tlsAddress = new InetSocketAddress("127.0.0.1", 12024); diff --git a/opendaylight/netconf/netconf-netty-util/pom.xml b/opendaylight/netconf/netconf-netty-util/pom.xml new file mode 100644 index 0000000000..13041598d1 --- /dev/null +++ b/opendaylight/netconf/netconf-netty-util/pom.xml @@ -0,0 +1,117 @@ + + + + 4.0.0 + + + org.opendaylight.controller + netconf-subsystem + 0.2.5-SNAPSHOT + + netconf-netty-util + bundle + ${project.artifactId} + + + + + ${project.groupId} + netconf-api + + + ${project.groupId} + netconf-mapping-api + + + ${project.groupId} + netconf-util + + + com.google.guava + guava + + + io.netty + netty-handler + + + org.opendaylight.controller + config-api + + + org.opendaylight.controller + protocol-framework + + + org.opendaylight.controller.thirdparty + ganymed + + + org.openexi + nagasena + + + org.openexi + nagasena-rta + + + + org.osgi + org.osgi.core + + + org.slf4j + slf4j-api + + + xmlunit + xmlunit + + + + + + + org.apache.felix + maven-bundle-plugin + + + ch.ethz.ssh2, com.google.common.base, com.google.common.collect, io.netty.buffer, + io.netty.channel, io.netty.channel.socket, io.netty.handler.codec, io.netty.handler.ssl, io.netty.util, + io.netty.util.concurrent, javax.xml.transform, javax.xml.transform.dom, javax.xml.transform.sax, + javax.xml.transform.stream, org.opendaylight.controller.netconf.api, + org.opendaylight.controller.netconf.util.messages, org.opendaylight.controller.netconf.util.xml, + org.opendaylight.protocol.framework, org.openexi.proc, org.openexi.proc.common, org.openexi.proc.grammars, + org.openexi.sax, org.openexi.schema, org.slf4j, org.w3c.dom, org.xml.sax + org.opendaylight.controller.netconf.nettyutil, + org.opendaylight.controller.netconf.nettyutil.handler, + org.opendaylight.controller.netconf.nettyutil.handler.exi, + org.opendaylight.controller.netconf.nettyutil.handler.ssh, + org.opendaylight.controller.netconf.nettyutil.handler.ssh.authentication, + org.opendaylight.controller.netconf.nettyutil.handler.ssh.client + + + + + org.apache.maven.plugins + maven-jar-plugin + 2.4 + + + + test-jar + + package + + + + + + + diff --git a/opendaylight/netconf/netconf-util/src/main/java/org/opendaylight/controller/netconf/util/AbstractChannelInitializer.java b/opendaylight/netconf/netconf-netty-util/src/main/java/org/opendaylight/controller/netconf/nettyutil/AbstractChannelInitializer.java similarity index 85% rename from opendaylight/netconf/netconf-util/src/main/java/org/opendaylight/controller/netconf/util/AbstractChannelInitializer.java rename to opendaylight/netconf/netconf-netty-util/src/main/java/org/opendaylight/controller/netconf/nettyutil/AbstractChannelInitializer.java index 48a45845a4..e88bf53ae0 100644 --- a/opendaylight/netconf/netconf-util/src/main/java/org/opendaylight/controller/netconf/util/AbstractChannelInitializer.java +++ b/opendaylight/netconf/netconf-netty-util/src/main/java/org/opendaylight/controller/netconf/nettyutil/AbstractChannelInitializer.java @@ -6,16 +6,15 @@ * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.controller.netconf.util; +package org.opendaylight.controller.netconf.nettyutil; import io.netty.channel.socket.SocketChannel; import io.netty.util.concurrent.Promise; - import org.opendaylight.controller.netconf.api.NetconfSession; -import org.opendaylight.controller.netconf.util.handler.FramingMechanismHandlerFactory; -import org.opendaylight.controller.netconf.util.handler.NetconfEOMAggregator; -import org.opendaylight.controller.netconf.util.handler.NetconfHelloMessageToXMLEncoder; -import org.opendaylight.controller.netconf.util.handler.NetconfXMLToHelloMessageDecoder; +import org.opendaylight.controller.netconf.nettyutil.handler.FramingMechanismHandlerFactory; +import org.opendaylight.controller.netconf.nettyutil.handler.NetconfEOMAggregator; +import org.opendaylight.controller.netconf.nettyutil.handler.NetconfHelloMessageToXMLEncoder; +import org.opendaylight.controller.netconf.nettyutil.handler.NetconfXMLToHelloMessageDecoder; import org.opendaylight.controller.netconf.util.messages.FramingMechanism; public abstract class AbstractChannelInitializer { diff --git a/opendaylight/netconf/netconf-util/src/main/java/org/opendaylight/controller/netconf/util/AbstractNetconfSession.java b/opendaylight/netconf/netconf-netty-util/src/main/java/org/opendaylight/controller/netconf/nettyutil/AbstractNetconfSession.java similarity index 94% rename from opendaylight/netconf/netconf-util/src/main/java/org/opendaylight/controller/netconf/util/AbstractNetconfSession.java rename to opendaylight/netconf/netconf-netty-util/src/main/java/org/opendaylight/controller/netconf/nettyutil/AbstractNetconfSession.java index c789206436..e0799d3a2a 100644 --- a/opendaylight/netconf/netconf-util/src/main/java/org/opendaylight/controller/netconf/util/AbstractNetconfSession.java +++ b/opendaylight/netconf/netconf-netty-util/src/main/java/org/opendaylight/controller/netconf/nettyutil/AbstractNetconfSession.java @@ -5,16 +5,19 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.controller.netconf.util; +package org.opendaylight.controller.netconf.nettyutil; +import io.netty.channel.Channel; +import io.netty.channel.ChannelFuture; +import io.netty.channel.ChannelHandler; import java.io.IOException; - +import org.opendaylight.controller.netconf.api.NetconfExiSession; import org.opendaylight.controller.netconf.api.NetconfMessage; import org.opendaylight.controller.netconf.api.NetconfSession; import org.opendaylight.controller.netconf.api.NetconfSessionListener; import org.opendaylight.controller.netconf.api.NetconfTerminationReason; -import org.opendaylight.controller.netconf.util.handler.NetconfEXICodec; -import org.opendaylight.controller.netconf.util.xml.EXIParameters; +import org.opendaylight.controller.netconf.nettyutil.handler.NetconfEXICodec; +import org.opendaylight.controller.netconf.nettyutil.handler.exi.EXIParameters; import org.opendaylight.controller.netconf.util.xml.XmlElement; import org.opendaylight.controller.netconf.util.xml.XmlUtil; import org.opendaylight.protocol.framework.AbstractProtocolSession; @@ -22,10 +25,6 @@ import org.openexi.proc.common.EXIOptionsException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import io.netty.channel.Channel; -import io.netty.channel.ChannelFuture; -import io.netty.channel.ChannelHandler; - public abstract class AbstractNetconfSession> extends AbstractProtocolSession implements NetconfSession, NetconfExiSession { private static final Logger logger = LoggerFactory.getLogger(AbstractNetconfSession.class); private final L sessionListener; diff --git a/opendaylight/netconf/netconf-util/src/main/java/org/opendaylight/controller/netconf/util/AbstractNetconfSessionNegotiator.java b/opendaylight/netconf/netconf-netty-util/src/main/java/org/opendaylight/controller/netconf/nettyutil/AbstractNetconfSessionNegotiator.java similarity index 95% rename from opendaylight/netconf/netconf-util/src/main/java/org/opendaylight/controller/netconf/util/AbstractNetconfSessionNegotiator.java rename to opendaylight/netconf/netconf-netty-util/src/main/java/org/opendaylight/controller/netconf/nettyutil/AbstractNetconfSessionNegotiator.java index b0c8c6dc19..f0e1b3f51f 100644 --- a/opendaylight/netconf/netconf-util/src/main/java/org/opendaylight/controller/netconf/util/AbstractNetconfSessionNegotiator.java +++ b/opendaylight/netconf/netconf-netty-util/src/main/java/org/opendaylight/controller/netconf/nettyutil/AbstractNetconfSessionNegotiator.java @@ -6,7 +6,7 @@ * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.controller.netconf.util; +package org.opendaylight.controller.netconf.nettyutil; import com.google.common.base.Optional; import com.google.common.base.Preconditions; @@ -21,15 +21,16 @@ import io.netty.util.TimerTask; import io.netty.util.concurrent.Future; import io.netty.util.concurrent.GenericFutureListener; import io.netty.util.concurrent.Promise; +import java.util.concurrent.TimeUnit; import org.opendaylight.controller.netconf.api.NetconfDocumentedException; import org.opendaylight.controller.netconf.api.NetconfMessage; import org.opendaylight.controller.netconf.api.NetconfSessionListener; import org.opendaylight.controller.netconf.api.NetconfSessionPreferences; -import org.opendaylight.controller.netconf.util.handler.FramingMechanismHandlerFactory; -import org.opendaylight.controller.netconf.util.handler.NetconfChunkAggregator; -import org.opendaylight.controller.netconf.util.handler.NetconfMessageToXMLEncoder; -import org.opendaylight.controller.netconf.util.handler.NetconfXMLToHelloMessageDecoder; -import org.opendaylight.controller.netconf.util.handler.NetconfXMLToMessageDecoder; +import org.opendaylight.controller.netconf.nettyutil.handler.FramingMechanismHandlerFactory; +import org.opendaylight.controller.netconf.nettyutil.handler.NetconfChunkAggregator; +import org.opendaylight.controller.netconf.nettyutil.handler.NetconfMessageToXMLEncoder; +import org.opendaylight.controller.netconf.nettyutil.handler.NetconfXMLToHelloMessageDecoder; +import org.opendaylight.controller.netconf.nettyutil.handler.NetconfXMLToMessageDecoder; import org.opendaylight.controller.netconf.util.messages.FramingMechanism; import org.opendaylight.controller.netconf.util.messages.NetconfHelloMessage; import org.opendaylight.controller.netconf.util.xml.XmlUtil; @@ -39,8 +40,6 @@ import org.slf4j.LoggerFactory; import org.w3c.dom.Document; import org.w3c.dom.NodeList; -import java.util.concurrent.TimeUnit; - public abstract class AbstractNetconfSessionNegotiator

, L extends NetconfSessionListener> extends AbstractSessionNegotiator { diff --git a/opendaylight/netconf/netconf-util/src/main/java/org/opendaylight/controller/netconf/util/handler/ChunkedFramingMechanismEncoder.java b/opendaylight/netconf/netconf-netty-util/src/main/java/org/opendaylight/controller/netconf/nettyutil/handler/ChunkedFramingMechanismEncoder.java similarity index 97% rename from opendaylight/netconf/netconf-util/src/main/java/org/opendaylight/controller/netconf/util/handler/ChunkedFramingMechanismEncoder.java rename to opendaylight/netconf/netconf-netty-util/src/main/java/org/opendaylight/controller/netconf/nettyutil/handler/ChunkedFramingMechanismEncoder.java index 8f4590cbb1..a66e45882f 100644 --- a/opendaylight/netconf/netconf-util/src/main/java/org/opendaylight/controller/netconf/util/handler/ChunkedFramingMechanismEncoder.java +++ b/opendaylight/netconf/netconf-netty-util/src/main/java/org/opendaylight/controller/netconf/nettyutil/handler/ChunkedFramingMechanismEncoder.java @@ -6,7 +6,7 @@ * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.controller.netconf.util.handler; +package org.opendaylight.controller.netconf.nettyutil.handler; import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; diff --git a/opendaylight/netconf/netconf-util/src/main/java/org/opendaylight/controller/netconf/util/handler/EOMFramingMechanismEncoder.java b/opendaylight/netconf/netconf-netty-util/src/main/java/org/opendaylight/controller/netconf/nettyutil/handler/EOMFramingMechanismEncoder.java similarity index 92% rename from opendaylight/netconf/netconf-util/src/main/java/org/opendaylight/controller/netconf/util/handler/EOMFramingMechanismEncoder.java rename to opendaylight/netconf/netconf-netty-util/src/main/java/org/opendaylight/controller/netconf/nettyutil/handler/EOMFramingMechanismEncoder.java index 8df62a6702..92d8f12c1a 100644 --- a/opendaylight/netconf/netconf-util/src/main/java/org/opendaylight/controller/netconf/util/handler/EOMFramingMechanismEncoder.java +++ b/opendaylight/netconf/netconf-netty-util/src/main/java/org/opendaylight/controller/netconf/nettyutil/handler/EOMFramingMechanismEncoder.java @@ -6,7 +6,7 @@ * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.controller.netconf.util.handler; +package org.opendaylight.controller.netconf.nettyutil.handler; import io.netty.buffer.ByteBuf; import io.netty.channel.ChannelHandlerContext; diff --git a/opendaylight/netconf/netconf-util/src/main/java/org/opendaylight/controller/netconf/util/handler/FramingMechanismHandlerFactory.java b/opendaylight/netconf/netconf-netty-util/src/main/java/org/opendaylight/controller/netconf/nettyutil/handler/FramingMechanismHandlerFactory.java similarity index 94% rename from opendaylight/netconf/netconf-util/src/main/java/org/opendaylight/controller/netconf/util/handler/FramingMechanismHandlerFactory.java rename to opendaylight/netconf/netconf-netty-util/src/main/java/org/opendaylight/controller/netconf/nettyutil/handler/FramingMechanismHandlerFactory.java index bac83e49d3..35f7679496 100644 --- a/opendaylight/netconf/netconf-util/src/main/java/org/opendaylight/controller/netconf/util/handler/FramingMechanismHandlerFactory.java +++ b/opendaylight/netconf/netconf-netty-util/src/main/java/org/opendaylight/controller/netconf/nettyutil/handler/FramingMechanismHandlerFactory.java @@ -6,7 +6,7 @@ * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.controller.netconf.util.handler; +package org.opendaylight.controller.netconf.nettyutil.handler; import org.opendaylight.controller.netconf.util.messages.FramingMechanism; import org.slf4j.Logger; diff --git a/opendaylight/netconf/netconf-util/src/main/java/org/opendaylight/controller/netconf/util/handler/NetconfChunkAggregator.java b/opendaylight/netconf/netconf-netty-util/src/main/java/org/opendaylight/controller/netconf/nettyutil/handler/NetconfChunkAggregator.java similarity index 99% rename from opendaylight/netconf/netconf-util/src/main/java/org/opendaylight/controller/netconf/util/handler/NetconfChunkAggregator.java rename to opendaylight/netconf/netconf-netty-util/src/main/java/org/opendaylight/controller/netconf/nettyutil/handler/NetconfChunkAggregator.java index 9f9f4191f7..e2a745f3fb 100644 --- a/opendaylight/netconf/netconf-util/src/main/java/org/opendaylight/controller/netconf/util/handler/NetconfChunkAggregator.java +++ b/opendaylight/netconf/netconf-netty-util/src/main/java/org/opendaylight/controller/netconf/nettyutil/handler/NetconfChunkAggregator.java @@ -6,7 +6,7 @@ * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.controller.netconf.util.handler; +package org.opendaylight.controller.netconf.nettyutil.handler; import java.util.List; diff --git a/opendaylight/netconf/netconf-util/src/main/java/org/opendaylight/controller/netconf/util/handler/NetconfEOMAggregator.java b/opendaylight/netconf/netconf-netty-util/src/main/java/org/opendaylight/controller/netconf/nettyutil/handler/NetconfEOMAggregator.java similarity index 97% rename from opendaylight/netconf/netconf-util/src/main/java/org/opendaylight/controller/netconf/util/handler/NetconfEOMAggregator.java rename to opendaylight/netconf/netconf-netty-util/src/main/java/org/opendaylight/controller/netconf/nettyutil/handler/NetconfEOMAggregator.java index 8b1bb3601d..f260bcbcef 100644 --- a/opendaylight/netconf/netconf-util/src/main/java/org/opendaylight/controller/netconf/util/handler/NetconfEOMAggregator.java +++ b/opendaylight/netconf/netconf-netty-util/src/main/java/org/opendaylight/controller/netconf/nettyutil/handler/NetconfEOMAggregator.java @@ -6,7 +6,7 @@ * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.controller.netconf.util.handler; +package org.opendaylight.controller.netconf.nettyutil.handler; import io.netty.buffer.ByteBuf; import io.netty.channel.ChannelHandlerContext; diff --git a/opendaylight/netconf/netconf-util/src/main/java/org/opendaylight/controller/netconf/util/handler/NetconfEXICodec.java b/opendaylight/netconf/netconf-netty-util/src/main/java/org/opendaylight/controller/netconf/nettyutil/handler/NetconfEXICodec.java similarity index 97% rename from opendaylight/netconf/netconf-util/src/main/java/org/opendaylight/controller/netconf/util/handler/NetconfEXICodec.java rename to opendaylight/netconf/netconf-netty-util/src/main/java/org/opendaylight/controller/netconf/nettyutil/handler/NetconfEXICodec.java index a6e2e52ea5..98baef0f85 100644 --- a/opendaylight/netconf/netconf-util/src/main/java/org/opendaylight/controller/netconf/util/handler/NetconfEXICodec.java +++ b/opendaylight/netconf/netconf-netty-util/src/main/java/org/opendaylight/controller/netconf/nettyutil/handler/NetconfEXICodec.java @@ -1,4 +1,4 @@ -package org.opendaylight.controller.netconf.util.handler; +package org.opendaylight.controller.netconf.nettyutil.handler; import com.google.common.base.Preconditions; import org.openexi.proc.HeaderOptionsOutputType; diff --git a/opendaylight/netconf/netconf-util/src/main/java/org/opendaylight/controller/netconf/util/handler/NetconfEXIToMessageDecoder.java b/opendaylight/netconf/netconf-netty-util/src/main/java/org/opendaylight/controller/netconf/nettyutil/handler/NetconfEXIToMessageDecoder.java similarity index 97% rename from opendaylight/netconf/netconf-util/src/main/java/org/opendaylight/controller/netconf/util/handler/NetconfEXIToMessageDecoder.java rename to opendaylight/netconf/netconf-netty-util/src/main/java/org/opendaylight/controller/netconf/nettyutil/handler/NetconfEXIToMessageDecoder.java index ae330d67e6..57134af3c7 100644 --- a/opendaylight/netconf/netconf-util/src/main/java/org/opendaylight/controller/netconf/util/handler/NetconfEXIToMessageDecoder.java +++ b/opendaylight/netconf/netconf-netty-util/src/main/java/org/opendaylight/controller/netconf/nettyutil/handler/NetconfEXIToMessageDecoder.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.controller.netconf.util.handler; +package org.opendaylight.controller.netconf.nettyutil.handler; import java.io.InputStream; import java.util.List; diff --git a/opendaylight/netconf/netconf-util/src/main/java/org/opendaylight/controller/netconf/util/handler/NetconfHelloMessageToXMLEncoder.java b/opendaylight/netconf/netconf-netty-util/src/main/java/org/opendaylight/controller/netconf/nettyutil/handler/NetconfHelloMessageToXMLEncoder.java similarity index 97% rename from opendaylight/netconf/netconf-util/src/main/java/org/opendaylight/controller/netconf/util/handler/NetconfHelloMessageToXMLEncoder.java rename to opendaylight/netconf/netconf-netty-util/src/main/java/org/opendaylight/controller/netconf/nettyutil/handler/NetconfHelloMessageToXMLEncoder.java index 65d5b27025..d765ca8b25 100644 --- a/opendaylight/netconf/netconf-util/src/main/java/org/opendaylight/controller/netconf/util/handler/NetconfHelloMessageToXMLEncoder.java +++ b/opendaylight/netconf/netconf-netty-util/src/main/java/org/opendaylight/controller/netconf/nettyutil/handler/NetconfHelloMessageToXMLEncoder.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.controller.netconf.util.handler; +package org.opendaylight.controller.netconf.nettyutil.handler; import io.netty.buffer.ByteBuf; import io.netty.channel.ChannelHandlerContext; diff --git a/opendaylight/netconf/netconf-util/src/main/java/org/opendaylight/controller/netconf/util/handler/NetconfMessageToEXIEncoder.java b/opendaylight/netconf/netconf-netty-util/src/main/java/org/opendaylight/controller/netconf/nettyutil/handler/NetconfMessageToEXIEncoder.java similarity index 97% rename from opendaylight/netconf/netconf-util/src/main/java/org/opendaylight/controller/netconf/util/handler/NetconfMessageToEXIEncoder.java rename to opendaylight/netconf/netconf-netty-util/src/main/java/org/opendaylight/controller/netconf/nettyutil/handler/NetconfMessageToEXIEncoder.java index 8425ce0779..0a866fffaa 100644 --- a/opendaylight/netconf/netconf-util/src/main/java/org/opendaylight/controller/netconf/util/handler/NetconfMessageToEXIEncoder.java +++ b/opendaylight/netconf/netconf-netty-util/src/main/java/org/opendaylight/controller/netconf/nettyutil/handler/NetconfMessageToEXIEncoder.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.controller.netconf.util.handler; +package org.opendaylight.controller.netconf.nettyutil.handler; import com.google.common.base.Preconditions; import io.netty.buffer.ByteBuf; diff --git a/opendaylight/netconf/netconf-util/src/main/java/org/opendaylight/controller/netconf/util/handler/NetconfMessageToXMLEncoder.java b/opendaylight/netconf/netconf-netty-util/src/main/java/org/opendaylight/controller/netconf/nettyutil/handler/NetconfMessageToXMLEncoder.java similarity index 97% rename from opendaylight/netconf/netconf-util/src/main/java/org/opendaylight/controller/netconf/util/handler/NetconfMessageToXMLEncoder.java rename to opendaylight/netconf/netconf-netty-util/src/main/java/org/opendaylight/controller/netconf/nettyutil/handler/NetconfMessageToXMLEncoder.java index 121ef8d743..fae2000bb5 100644 --- a/opendaylight/netconf/netconf-util/src/main/java/org/opendaylight/controller/netconf/util/handler/NetconfMessageToXMLEncoder.java +++ b/opendaylight/netconf/netconf-netty-util/src/main/java/org/opendaylight/controller/netconf/nettyutil/handler/NetconfMessageToXMLEncoder.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.controller.netconf.util.handler; +package org.opendaylight.controller.netconf.nettyutil.handler; import io.netty.buffer.ByteBuf; import io.netty.buffer.ByteBufOutputStream; diff --git a/opendaylight/netconf/netconf-util/src/main/java/org/opendaylight/controller/netconf/util/handler/NetconfXMLToHelloMessageDecoder.java b/opendaylight/netconf/netconf-netty-util/src/main/java/org/opendaylight/controller/netconf/nettyutil/handler/NetconfXMLToHelloMessageDecoder.java similarity index 99% rename from opendaylight/netconf/netconf-util/src/main/java/org/opendaylight/controller/netconf/util/handler/NetconfXMLToHelloMessageDecoder.java rename to opendaylight/netconf/netconf-netty-util/src/main/java/org/opendaylight/controller/netconf/nettyutil/handler/NetconfXMLToHelloMessageDecoder.java index 361d4fcee9..efe4861577 100644 --- a/opendaylight/netconf/netconf-util/src/main/java/org/opendaylight/controller/netconf/util/handler/NetconfXMLToHelloMessageDecoder.java +++ b/opendaylight/netconf/netconf-netty-util/src/main/java/org/opendaylight/controller/netconf/nettyutil/handler/NetconfXMLToHelloMessageDecoder.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.controller.netconf.util.handler; +package org.opendaylight.controller.netconf.nettyutil.handler; import com.google.common.base.Preconditions; import com.google.common.collect.Lists; diff --git a/opendaylight/netconf/netconf-util/src/main/java/org/opendaylight/controller/netconf/util/handler/NetconfXMLToMessageDecoder.java b/opendaylight/netconf/netconf-netty-util/src/main/java/org/opendaylight/controller/netconf/nettyutil/handler/NetconfXMLToMessageDecoder.java similarity index 95% rename from opendaylight/netconf/netconf-util/src/main/java/org/opendaylight/controller/netconf/util/handler/NetconfXMLToMessageDecoder.java rename to opendaylight/netconf/netconf-netty-util/src/main/java/org/opendaylight/controller/netconf/nettyutil/handler/NetconfXMLToMessageDecoder.java index 23f48b31d8..69c0d53fc1 100644 --- a/opendaylight/netconf/netconf-util/src/main/java/org/opendaylight/controller/netconf/util/handler/NetconfXMLToMessageDecoder.java +++ b/opendaylight/netconf/netconf-netty-util/src/main/java/org/opendaylight/controller/netconf/nettyutil/handler/NetconfXMLToMessageDecoder.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.controller.netconf.util.handler; +package org.opendaylight.controller.netconf.nettyutil.handler; import java.util.List; diff --git a/opendaylight/netconf/netconf-util/src/main/java/org/opendaylight/controller/netconf/util/xml/EXIParameters.java b/opendaylight/netconf/netconf-netty-util/src/main/java/org/opendaylight/controller/netconf/nettyutil/handler/exi/EXIParameters.java similarity index 97% rename from opendaylight/netconf/netconf-util/src/main/java/org/opendaylight/controller/netconf/util/xml/EXIParameters.java rename to opendaylight/netconf/netconf-netty-util/src/main/java/org/opendaylight/controller/netconf/nettyutil/handler/exi/EXIParameters.java index 593b77f193..84353a4646 100644 --- a/opendaylight/netconf/netconf-util/src/main/java/org/opendaylight/controller/netconf/util/xml/EXIParameters.java +++ b/opendaylight/netconf/netconf-netty-util/src/main/java/org/opendaylight/controller/netconf/nettyutil/handler/exi/EXIParameters.java @@ -5,9 +5,10 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.controller.netconf.util.xml; +package org.opendaylight.controller.netconf.nettyutil.handler.exi; import org.opendaylight.controller.netconf.api.NetconfMessage; +import org.opendaylight.controller.netconf.util.xml.XmlElement; import org.openexi.proc.common.AlignmentType; import org.openexi.proc.common.EXIOptions; import org.openexi.proc.common.EXIOptionsException; diff --git a/opendaylight/netconf/netconf-util/src/main/java/org/opendaylight/controller/netconf/util/messages/NetconfStartExiMessage.java b/opendaylight/netconf/netconf-netty-util/src/main/java/org/opendaylight/controller/netconf/nettyutil/handler/exi/NetconfStartExiMessage.java similarity index 98% rename from opendaylight/netconf/netconf-util/src/main/java/org/opendaylight/controller/netconf/util/messages/NetconfStartExiMessage.java rename to opendaylight/netconf/netconf-netty-util/src/main/java/org/opendaylight/controller/netconf/nettyutil/handler/exi/NetconfStartExiMessage.java index 4fe6adc0a5..9e287f9921 100644 --- a/opendaylight/netconf/netconf-util/src/main/java/org/opendaylight/controller/netconf/util/messages/NetconfStartExiMessage.java +++ b/opendaylight/netconf/netconf-netty-util/src/main/java/org/opendaylight/controller/netconf/nettyutil/handler/exi/NetconfStartExiMessage.java @@ -6,7 +6,7 @@ * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.controller.netconf.util.messages; +package org.opendaylight.controller.netconf.nettyutil.handler.exi; import java.util.List; diff --git a/opendaylight/netconf/netconf-util/src/main/java/org/opendaylight/controller/netconf/util/handler/ssh/SshHandler.java b/opendaylight/netconf/netconf-netty-util/src/main/java/org/opendaylight/controller/netconf/nettyutil/handler/ssh/SshHandler.java similarity index 80% rename from opendaylight/netconf/netconf-util/src/main/java/org/opendaylight/controller/netconf/util/handler/ssh/SshHandler.java rename to opendaylight/netconf/netconf-netty-util/src/main/java/org/opendaylight/controller/netconf/nettyutil/handler/ssh/SshHandler.java index 49d5a05ae2..1427c6f3a7 100644 --- a/opendaylight/netconf/netconf-util/src/main/java/org/opendaylight/controller/netconf/util/handler/ssh/SshHandler.java +++ b/opendaylight/netconf/netconf-netty-util/src/main/java/org/opendaylight/controller/netconf/nettyutil/handler/ssh/SshHandler.java @@ -6,7 +6,7 @@ * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.controller.netconf.util.handler.ssh; +package org.opendaylight.controller.netconf.nettyutil.handler.ssh; import io.netty.buffer.ByteBuf; import io.netty.channel.ChannelFuture; @@ -18,15 +18,15 @@ import io.netty.channel.ChannelPromise; import java.io.IOException; import java.net.SocketAddress; -import org.opendaylight.controller.netconf.util.handler.ssh.authentication.AuthenticationHandler; -import org.opendaylight.controller.netconf.util.handler.ssh.client.Invoker; -import org.opendaylight.controller.netconf.util.handler.ssh.client.SshClient; -import org.opendaylight.controller.netconf.util.handler.ssh.client.SshClientAdapter; -import org.opendaylight.controller.netconf.util.handler.ssh.virtualsocket.VirtualSocket; +import org.opendaylight.controller.netconf.nettyutil.handler.ssh.client.SshClient; +import org.opendaylight.controller.netconf.nettyutil.handler.ssh.authentication.AuthenticationHandler; +import org.opendaylight.controller.netconf.nettyutil.handler.ssh.client.Invoker; +import org.opendaylight.controller.netconf.nettyutil.handler.ssh.client.SshClientAdapter; +import org.opendaylight.controller.netconf.nettyutil.handler.ssh.virtualsocket.VirtualSocket; /** * Netty SSH handler class. Acts as interface between Netty and SSH library. All standard Netty message handling - * stops at instance of this class. All downstream events are handed of to wrapped {@link org.opendaylight.controller.netconf.util.handler.ssh.client.SshClientAdapter}; + * stops at instance of this class. All downstream events are handed of to wrapped {@link org.opendaylight.controller.netconf.nettyutil.handler.ssh.client.SshClientAdapter}; */ public class SshHandler extends ChannelOutboundHandlerAdapter { private static final String SOCKET = "socket"; diff --git a/opendaylight/netconf/netconf-util/src/main/java/org/opendaylight/controller/netconf/util/handler/ssh/authentication/AuthenticationHandler.java b/opendaylight/netconf/netconf-netty-util/src/main/java/org/opendaylight/controller/netconf/nettyutil/handler/ssh/authentication/AuthenticationHandler.java similarity index 87% rename from opendaylight/netconf/netconf-util/src/main/java/org/opendaylight/controller/netconf/util/handler/ssh/authentication/AuthenticationHandler.java rename to opendaylight/netconf/netconf-netty-util/src/main/java/org/opendaylight/controller/netconf/nettyutil/handler/ssh/authentication/AuthenticationHandler.java index a0e82f8bac..b22b792d52 100644 --- a/opendaylight/netconf/netconf-util/src/main/java/org/opendaylight/controller/netconf/util/handler/ssh/authentication/AuthenticationHandler.java +++ b/opendaylight/netconf/netconf-netty-util/src/main/java/org/opendaylight/controller/netconf/nettyutil/handler/ssh/authentication/AuthenticationHandler.java @@ -6,7 +6,7 @@ * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.controller.netconf.util.handler.ssh.authentication; +package org.opendaylight.controller.netconf.nettyutil.handler.ssh.authentication; import ch.ethz.ssh2.Connection; diff --git a/opendaylight/netconf/netconf-util/src/main/java/org/opendaylight/controller/netconf/util/handler/ssh/authentication/LoginPassword.java b/opendaylight/netconf/netconf-netty-util/src/main/java/org/opendaylight/controller/netconf/nettyutil/handler/ssh/authentication/LoginPassword.java similarity index 86% rename from opendaylight/netconf/netconf-util/src/main/java/org/opendaylight/controller/netconf/util/handler/ssh/authentication/LoginPassword.java rename to opendaylight/netconf/netconf-netty-util/src/main/java/org/opendaylight/controller/netconf/nettyutil/handler/ssh/authentication/LoginPassword.java index c482e77735..67027d8014 100644 --- a/opendaylight/netconf/netconf-util/src/main/java/org/opendaylight/controller/netconf/util/handler/ssh/authentication/LoginPassword.java +++ b/opendaylight/netconf/netconf-netty-util/src/main/java/org/opendaylight/controller/netconf/nettyutil/handler/ssh/authentication/LoginPassword.java @@ -6,7 +6,7 @@ * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.controller.netconf.util.handler.ssh.authentication; +package org.opendaylight.controller.netconf.nettyutil.handler.ssh.authentication; import ch.ethz.ssh2.Connection; @@ -14,7 +14,7 @@ import java.io.IOException; /** * Class Providing username/password authentication option to - * {@link org.opendaylight.controller.netconf.util.handler.ssh.SshHandler} + * {@link org.opendaylight.controller.netconf.nettyutil.handler.ssh.SshHandler} */ public class LoginPassword extends AuthenticationHandler { private final String username; diff --git a/opendaylight/netconf/netconf-util/src/main/java/org/opendaylight/controller/netconf/util/handler/ssh/client/Invoker.java b/opendaylight/netconf/netconf-netty-util/src/main/java/org/opendaylight/controller/netconf/nettyutil/handler/ssh/client/Invoker.java similarity index 94% rename from opendaylight/netconf/netconf-util/src/main/java/org/opendaylight/controller/netconf/util/handler/ssh/client/Invoker.java rename to opendaylight/netconf/netconf-netty-util/src/main/java/org/opendaylight/controller/netconf/nettyutil/handler/ssh/client/Invoker.java index fffb304d26..d542e1952a 100644 --- a/opendaylight/netconf/netconf-util/src/main/java/org/opendaylight/controller/netconf/util/handler/ssh/client/Invoker.java +++ b/opendaylight/netconf/netconf-netty-util/src/main/java/org/opendaylight/controller/netconf/nettyutil/handler/ssh/client/Invoker.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.controller.netconf.util.handler.ssh.client; +package org.opendaylight.controller.netconf.nettyutil.handler.ssh.client; import java.io.IOException; diff --git a/opendaylight/netconf/netconf-util/src/main/java/org/opendaylight/controller/netconf/util/handler/ssh/client/SshClient.java b/opendaylight/netconf/netconf-netty-util/src/main/java/org/opendaylight/controller/netconf/nettyutil/handler/ssh/client/SshClient.java similarity index 87% rename from opendaylight/netconf/netconf-util/src/main/java/org/opendaylight/controller/netconf/util/handler/ssh/client/SshClient.java rename to opendaylight/netconf/netconf-netty-util/src/main/java/org/opendaylight/controller/netconf/nettyutil/handler/ssh/client/SshClient.java index 50f44054c1..3520fe029d 100644 --- a/opendaylight/netconf/netconf-util/src/main/java/org/opendaylight/controller/netconf/util/handler/ssh/client/SshClient.java +++ b/opendaylight/netconf/netconf-netty-util/src/main/java/org/opendaylight/controller/netconf/nettyutil/handler/ssh/client/SshClient.java @@ -6,13 +6,13 @@ * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.controller.netconf.util.handler.ssh.client; +package org.opendaylight.controller.netconf.nettyutil.handler.ssh.client; import ch.ethz.ssh2.Connection; import ch.ethz.ssh2.Session; import ch.ethz.ssh2.channel.Channel; -import org.opendaylight.controller.netconf.util.handler.ssh.authentication.AuthenticationHandler; -import org.opendaylight.controller.netconf.util.handler.ssh.virtualsocket.VirtualSocket; +import org.opendaylight.controller.netconf.nettyutil.handler.ssh.authentication.AuthenticationHandler; +import org.opendaylight.controller.netconf.nettyutil.handler.ssh.virtualsocket.VirtualSocket; import java.io.IOException; import java.util.HashMap; diff --git a/opendaylight/netconf/netconf-util/src/main/java/org/opendaylight/controller/netconf/util/handler/ssh/client/SshClientAdapter.java b/opendaylight/netconf/netconf-netty-util/src/main/java/org/opendaylight/controller/netconf/nettyutil/handler/ssh/client/SshClientAdapter.java similarity index 95% rename from opendaylight/netconf/netconf-util/src/main/java/org/opendaylight/controller/netconf/util/handler/ssh/client/SshClientAdapter.java rename to opendaylight/netconf/netconf-netty-util/src/main/java/org/opendaylight/controller/netconf/nettyutil/handler/ssh/client/SshClientAdapter.java index 244bcc0041..87056db06c 100644 --- a/opendaylight/netconf/netconf-util/src/main/java/org/opendaylight/controller/netconf/util/handler/ssh/client/SshClientAdapter.java +++ b/opendaylight/netconf/netconf-netty-util/src/main/java/org/opendaylight/controller/netconf/nettyutil/handler/ssh/client/SshClientAdapter.java @@ -6,7 +6,7 @@ * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.controller.netconf.util.handler.ssh.client; +package org.opendaylight.controller.netconf.nettyutil.handler.ssh.client; import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; @@ -19,7 +19,7 @@ import java.io.OutputStream; import java.util.LinkedList; import java.util.Queue; import java.util.concurrent.atomic.AtomicBoolean; -import org.opendaylight.controller.netconf.util.handler.ssh.virtualsocket.VirtualSocketException; +import org.opendaylight.controller.netconf.nettyutil.handler.ssh.virtualsocket.VirtualSocketException; /** diff --git a/opendaylight/netconf/netconf-util/src/main/java/org/opendaylight/controller/netconf/util/handler/ssh/client/SshSession.java b/opendaylight/netconf/netconf-netty-util/src/main/java/org/opendaylight/controller/netconf/nettyutil/handler/ssh/client/SshSession.java similarity index 96% rename from opendaylight/netconf/netconf-util/src/main/java/org/opendaylight/controller/netconf/util/handler/ssh/client/SshSession.java rename to opendaylight/netconf/netconf-netty-util/src/main/java/org/opendaylight/controller/netconf/nettyutil/handler/ssh/client/SshSession.java index 411036c975..8311554cda 100644 --- a/opendaylight/netconf/netconf-util/src/main/java/org/opendaylight/controller/netconf/util/handler/ssh/client/SshSession.java +++ b/opendaylight/netconf/netconf-netty-util/src/main/java/org/opendaylight/controller/netconf/nettyutil/handler/ssh/client/SshSession.java @@ -6,7 +6,7 @@ * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.controller.netconf.util.handler.ssh.client; +package org.opendaylight.controller.netconf.nettyutil.handler.ssh.client; import ch.ethz.ssh2.Session; import ch.ethz.ssh2.StreamGobbler; diff --git a/opendaylight/netconf/netconf-util/src/main/java/org/opendaylight/controller/netconf/util/handler/ssh/virtualsocket/ChannelInputStream.java b/opendaylight/netconf/netconf-netty-util/src/main/java/org/opendaylight/controller/netconf/nettyutil/handler/ssh/virtualsocket/ChannelInputStream.java similarity index 97% rename from opendaylight/netconf/netconf-util/src/main/java/org/opendaylight/controller/netconf/util/handler/ssh/virtualsocket/ChannelInputStream.java rename to opendaylight/netconf/netconf-netty-util/src/main/java/org/opendaylight/controller/netconf/nettyutil/handler/ssh/virtualsocket/ChannelInputStream.java index b8f13699ba..2a3eeb21a8 100644 --- a/opendaylight/netconf/netconf-util/src/main/java/org/opendaylight/controller/netconf/util/handler/ssh/virtualsocket/ChannelInputStream.java +++ b/opendaylight/netconf/netconf-netty-util/src/main/java/org/opendaylight/controller/netconf/nettyutil/handler/ssh/virtualsocket/ChannelInputStream.java @@ -6,7 +6,7 @@ * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.controller.netconf.util.handler.ssh.virtualsocket; +package org.opendaylight.controller.netconf.nettyutil.handler.ssh.virtualsocket; import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; diff --git a/opendaylight/netconf/netconf-util/src/main/java/org/opendaylight/controller/netconf/util/handler/ssh/virtualsocket/ChannelOutputStream.java b/opendaylight/netconf/netconf-netty-util/src/main/java/org/opendaylight/controller/netconf/nettyutil/handler/ssh/virtualsocket/ChannelOutputStream.java similarity index 96% rename from opendaylight/netconf/netconf-util/src/main/java/org/opendaylight/controller/netconf/util/handler/ssh/virtualsocket/ChannelOutputStream.java rename to opendaylight/netconf/netconf-netty-util/src/main/java/org/opendaylight/controller/netconf/nettyutil/handler/ssh/virtualsocket/ChannelOutputStream.java index cd7ec5439b..2dc5235f91 100644 --- a/opendaylight/netconf/netconf-util/src/main/java/org/opendaylight/controller/netconf/util/handler/ssh/virtualsocket/ChannelOutputStream.java +++ b/opendaylight/netconf/netconf-netty-util/src/main/java/org/opendaylight/controller/netconf/nettyutil/handler/ssh/virtualsocket/ChannelOutputStream.java @@ -6,7 +6,7 @@ * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.controller.netconf.util.handler.ssh.virtualsocket; +package org.opendaylight.controller.netconf.nettyutil.handler.ssh.virtualsocket; import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; diff --git a/opendaylight/netconf/netconf-util/src/main/java/org/opendaylight/controller/netconf/util/handler/ssh/virtualsocket/VirtualSocket.java b/opendaylight/netconf/netconf-netty-util/src/main/java/org/opendaylight/controller/netconf/nettyutil/handler/ssh/virtualsocket/VirtualSocket.java similarity index 98% rename from opendaylight/netconf/netconf-util/src/main/java/org/opendaylight/controller/netconf/util/handler/ssh/virtualsocket/VirtualSocket.java rename to opendaylight/netconf/netconf-netty-util/src/main/java/org/opendaylight/controller/netconf/nettyutil/handler/ssh/virtualsocket/VirtualSocket.java index 36c2c1c329..6debeba97e 100644 --- a/opendaylight/netconf/netconf-util/src/main/java/org/opendaylight/controller/netconf/util/handler/ssh/virtualsocket/VirtualSocket.java +++ b/opendaylight/netconf/netconf-netty-util/src/main/java/org/opendaylight/controller/netconf/nettyutil/handler/ssh/virtualsocket/VirtualSocket.java @@ -6,7 +6,7 @@ * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.controller.netconf.util.handler.ssh.virtualsocket; +package org.opendaylight.controller.netconf.nettyutil.handler.ssh.virtualsocket; import io.netty.channel.ChannelHandler; import io.netty.channel.ChannelHandlerContext; diff --git a/opendaylight/netconf/netconf-util/src/main/java/org/opendaylight/controller/netconf/util/handler/ssh/virtualsocket/VirtualSocketException.java b/opendaylight/netconf/netconf-netty-util/src/main/java/org/opendaylight/controller/netconf/nettyutil/handler/ssh/virtualsocket/VirtualSocketException.java similarity index 86% rename from opendaylight/netconf/netconf-util/src/main/java/org/opendaylight/controller/netconf/util/handler/ssh/virtualsocket/VirtualSocketException.java rename to opendaylight/netconf/netconf-netty-util/src/main/java/org/opendaylight/controller/netconf/nettyutil/handler/ssh/virtualsocket/VirtualSocketException.java index 5907ea8f13..d97990a5e6 100644 --- a/opendaylight/netconf/netconf-util/src/main/java/org/opendaylight/controller/netconf/util/handler/ssh/virtualsocket/VirtualSocketException.java +++ b/opendaylight/netconf/netconf-netty-util/src/main/java/org/opendaylight/controller/netconf/nettyutil/handler/ssh/virtualsocket/VirtualSocketException.java @@ -6,7 +6,7 @@ * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.controller.netconf.util.handler.ssh.virtualsocket; +package org.opendaylight.controller.netconf.nettyutil.handler.ssh.virtualsocket; /** * Exception class which provides notification about exceptional situations at the virtual socket layer. diff --git a/opendaylight/netconf/netconf-util/src/test/java/org/opendaylight/controller/netconf/util/handler/NetconfChunkAggregatorTest.java b/opendaylight/netconf/netconf-netty-util/src/test/java/org/opendaylight/controller/netconf/nettyutil/handler/NetconfChunkAggregatorTest.java similarity index 97% rename from opendaylight/netconf/netconf-util/src/test/java/org/opendaylight/controller/netconf/util/handler/NetconfChunkAggregatorTest.java rename to opendaylight/netconf/netconf-netty-util/src/test/java/org/opendaylight/controller/netconf/nettyutil/handler/NetconfChunkAggregatorTest.java index bdc183579b..e088859e82 100644 --- a/opendaylight/netconf/netconf-util/src/test/java/org/opendaylight/controller/netconf/util/handler/NetconfChunkAggregatorTest.java +++ b/opendaylight/netconf/netconf-netty-util/src/test/java/org/opendaylight/controller/netconf/nettyutil/handler/NetconfChunkAggregatorTest.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.controller.netconf.util.handler; +package org.opendaylight.controller.netconf.nettyutil.handler; import com.google.common.base.Charsets; import com.google.common.collect.Lists; diff --git a/opendaylight/netconf/netconf-util/src/test/java/org/opendaylight/controller/netconf/util/messages/NetconfMessageFactoryTest.java b/opendaylight/netconf/netconf-netty-util/src/test/java/org/opendaylight/controller/netconf/nettyutil/handler/NetconfMessageFactoryTest.java similarity index 87% rename from opendaylight/netconf/netconf-util/src/test/java/org/opendaylight/controller/netconf/util/messages/NetconfMessageFactoryTest.java rename to opendaylight/netconf/netconf-netty-util/src/test/java/org/opendaylight/controller/netconf/nettyutil/handler/NetconfMessageFactoryTest.java index 18830f85dd..d4d40e7438 100644 --- a/opendaylight/netconf/netconf-util/src/test/java/org/opendaylight/controller/netconf/util/messages/NetconfMessageFactoryTest.java +++ b/opendaylight/netconf/netconf-netty-util/src/test/java/org/opendaylight/controller/netconf/nettyutil/handler/NetconfMessageFactoryTest.java @@ -5,19 +5,16 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.controller.netconf.util.messages; +package org.opendaylight.controller.netconf.nettyutil.handler; import static org.junit.Assert.assertEquals; -import io.netty.buffer.Unpooled; +import com.google.common.io.Files; +import io.netty.buffer.Unpooled; import java.io.File; import java.util.ArrayList; import java.util.List; - import org.junit.Test; -import org.opendaylight.controller.netconf.util.handler.NetconfXMLToHelloMessageDecoder; - -import com.google.common.io.Files; public class NetconfMessageFactoryTest { @Test diff --git a/opendaylight/netconf/netconf-util/src/test/resources/netconfMessages/client_hello_with_auth.xml b/opendaylight/netconf/netconf-netty-util/src/test/resources/netconfMessages/client_hello_with_auth.xml similarity index 100% rename from opendaylight/netconf/netconf-util/src/test/resources/netconfMessages/client_hello_with_auth.xml rename to opendaylight/netconf/netconf-netty-util/src/test/resources/netconfMessages/client_hello_with_auth.xml diff --git a/opendaylight/netconf/netconf-util/pom.xml b/opendaylight/netconf/netconf-util/pom.xml index 14a71fd9ba..dcbdcabbba 100644 --- a/opendaylight/netconf/netconf-util/pom.xml +++ b/opendaylight/netconf/netconf-util/pom.xml @@ -33,23 +33,6 @@ org.opendaylight.controller config-api - - org.opendaylight.controller - protocol-framework - - - org.opendaylight.controller.thirdparty - ganymed - - - org.openexi - nagasena - - - org.openexi - nagasena-rta - - org.osgi org.osgi.core @@ -61,6 +44,7 @@ xmlunit xmlunit + test @@ -71,44 +55,12 @@ maven-bundle-plugin - org.opendaylight.controller.netconf.util, - org.opendaylight.controller.netconf.util.xml, - org.opendaylight.controller.netconf.util.osgi, - org.opendaylight.controller.netconf.util.mapping, - org.opendaylight.controller.netconf.util.messages, - org.opendaylight.controller.netconf.util.handler, - org.opendaylight.controller.netconf.util.handler.*, - org.opendaylight.controller.netconf.util.exception, - com.google.common.base, - com.google.common.collect, - ch.ethz.ssh2, - io.netty.buffer, - io.netty.channel, - io.netty.channel.socket, - io.netty.handler.codec, - io.netty.handler.ssl, - io.netty.util, - io.netty.util.concurrent, - javax.annotation, - javax.net.ssl, - javax.xml.namespace, - javax.xml.parsers, - javax.xml.transform, - javax.xml.transform.dom, - javax.xml.transform.stream, - javax.xml.validation, - javax.xml.xpath, - javax.xml.transform.sax, - org.opendaylight.controller.netconf.api, - org.opendaylight.controller.netconf.mapping.api, - org.opendaylight.protocol.framework, - org.osgi.framework, - org.slf4j, - org.w3c.dom, - org.xml.sax, - org.xml.sax.helpers, - org.opendaylight.controller.config.api, - org.openexi.*, + com.google.common.base, com.google.common.collect, io.netty.channel, + io.netty.util.concurrent, javax.annotation, javax.xml.namespace, javax.xml.parsers, javax.xml.transform, + javax.xml.transform.dom, javax.xml.transform.stream, javax.xml.validation, javax.xml.xpath, + org.opendaylight.controller.netconf.api, org.opendaylight.controller.netconf.mapping.api, + org.osgi.framework, org.slf4j, org.w3c.dom, org.xml.sax + org.opendaylight.controller.netconf.util.* diff --git a/opendaylight/netconf/netconf-util/src/main/java/org/opendaylight/controller/netconf/util/NetconfUtil.java b/opendaylight/netconf/netconf-util/src/main/java/org/opendaylight/controller/netconf/util/NetconfUtil.java index 9443f93f92..640596d930 100644 --- a/opendaylight/netconf/netconf-util/src/main/java/org/opendaylight/controller/netconf/util/NetconfUtil.java +++ b/opendaylight/netconf/netconf-util/src/main/java/org/opendaylight/controller/netconf/util/NetconfUtil.java @@ -9,20 +9,12 @@ package org.opendaylight.controller.netconf.util; import com.google.common.base.Preconditions; import org.opendaylight.controller.netconf.api.NetconfDocumentedException; -import org.opendaylight.controller.netconf.api.NetconfMessage; import org.opendaylight.controller.netconf.util.xml.XmlElement; import org.opendaylight.controller.netconf.util.xml.XmlNetconfConstants; import org.opendaylight.controller.netconf.util.xml.XmlUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.w3c.dom.Document; -import org.xml.sax.SAXException; - -import java.io.File; -import java.io.FileInputStream; -import java.io.FileNotFoundException; -import java.io.IOException; -import java.io.InputStream; public final class NetconfUtil { @@ -30,29 +22,6 @@ public final class NetconfUtil { private NetconfUtil() {} - public static NetconfMessage createMessage(final File f) { - Preconditions.checkNotNull(f, "File parameter was null"); - try { - return createMessage(new FileInputStream(f)); - } catch (final FileNotFoundException e) { - logger.warn("File {} not found.", f, e); - } - return null; - } - - public static NetconfMessage createMessage(final InputStream is) { - Preconditions.checkNotNull(is, "InputStream parameter was null"); - Document doc = null; - try { - doc = XmlUtil.readXmlToDocument(is); - } catch (final IOException e) { - logger.warn("Error ocurred while parsing stream.", e); - } catch (final SAXException e) { - logger.warn("Error ocurred while final parsing stream.", e); - } - return (doc == null) ? null : new NetconfMessage(doc); - } - public static Document checkIsMessageOk(Document response) throws NetconfDocumentedException { XmlElement element = XmlElement.fromDomDocument(response); Preconditions.checkState(element.getName().equals(XmlNetconfConstants.RPC_REPLY_KEY)); diff --git a/opendaylight/netconf/pom.xml b/opendaylight/netconf/pom.xml index 50e84463f5..4f87fd8626 100644 --- a/opendaylight/netconf/pom.xml +++ b/opendaylight/netconf/pom.xml @@ -22,6 +22,7 @@ netconf-impl config-netconf-connector netconf-util + netconf-netty-util config-persister-impl netconf-mapping-api netconf-client -- 2.36.6