X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=opendaylight%2Fnetconf%2Fnetconf-util%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fnetconf%2Futil%2FAbstractNetconfSessionNegotiator.java;h=71f08339c803774d3d3b50a701b2d55454e9081e;hb=1745f92957146128e8a4a111adb7ed830f737e0a;hp=e30ce5b47e961f87adccebcce363f2092da9c165;hpb=59edff19362f894f68b598f989716070c57abe1c;p=controller.git diff --git a/opendaylight/netconf/netconf-util/src/main/java/org/opendaylight/controller/netconf/util/AbstractNetconfSessionNegotiator.java b/opendaylight/netconf/netconf-util/src/main/java/org/opendaylight/controller/netconf/util/AbstractNetconfSessionNegotiator.java index e30ce5b47e..71f08339c8 100644 --- a/opendaylight/netconf/netconf-util/src/main/java/org/opendaylight/controller/netconf/util/AbstractNetconfSessionNegotiator.java +++ b/opendaylight/netconf/netconf-util/src/main/java/org/opendaylight/controller/netconf/util/AbstractNetconfSessionNegotiator.java @@ -8,8 +8,6 @@ package org.opendaylight.controller.netconf.util; -import com.google.common.base.Optional; -import com.google.common.base.Preconditions; import io.netty.channel.Channel; import io.netty.channel.ChannelHandler; import io.netty.channel.ChannelHandlerContext; @@ -20,37 +18,39 @@ 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 io.netty.channel.ChannelInboundHandlerAdapter; +import org.opendaylight.controller.netconf.api.AbstractNetconfSession; 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.NetconfSessionPreferences; import org.opendaylight.controller.netconf.util.handler.FramingMechanismHandlerFactory; -import org.opendaylight.controller.netconf.util.handler.NetconfMessageAggregator; -import org.opendaylight.controller.netconf.util.handler.NetconfMessageChunkDecoder; +import org.opendaylight.controller.netconf.util.handler.NetconfChunkAggregator; +import org.opendaylight.controller.netconf.util.handler.NetconfMessageToXMLEncoder; +import org.opendaylight.controller.netconf.util.handler.NetconfXMLToMessageDecoder; import org.opendaylight.controller.netconf.util.messages.FramingMechanism; -import org.opendaylight.controller.netconf.util.xml.XmlElement; -import org.opendaylight.controller.netconf.util.xml.XmlNetconfConstants; +import org.opendaylight.controller.netconf.util.messages.NetconfHelloMessage; import org.opendaylight.controller.netconf.util.xml.XmlUtil; import org.opendaylight.protocol.framework.AbstractSessionNegotiator; -import org.opendaylight.protocol.framework.SessionListener; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.w3c.dom.Document; import org.w3c.dom.NodeList; -import java.util.concurrent.TimeUnit; - -public abstract class AbstractNetconfSessionNegotiator

- extends AbstractSessionNegotiator { +import com.google.common.base.Optional; +import com.google.common.base.Preconditions; - // TODO what time ? - private static final long INITIAL_HOLDTIMER = 1; +public abstract class AbstractNetconfSessionNegotiator

, L extends NetconfSessionListener> +extends AbstractSessionNegotiator { private static final Logger logger = LoggerFactory.getLogger(AbstractNetconfSessionNegotiator.class); public static final String NAME_OF_EXCEPTION_HANDLER = "lastExceptionHandler"; - protected final P sessionPreferences; + private final P sessionPreferences; - private final SessionListener sessionListener; + private final L sessionListener; private Timeout timeout; /** @@ -62,13 +62,15 @@ public abstract class AbstractNetconfSessionNegotiator

promise, Channel channel, Timer timer, - SessionListener sessionListener) { + L sessionListener, long connectionTimeoutMillis) { super(promise, channel); this.sessionPreferences = sessionPreferences; this.timer = timer; this.sessionListener = sessionListener; + this.connectionTimeoutMillis = connectionTimeoutMillis; } @Override @@ -78,14 +80,15 @@ public abstract class AbstractNetconfSessionNegotiator

future = sslHandler.get().handshakeFuture(); future.addListener(new GenericFutureListener>() { @Override - public void operationComplete(Future future) throws Exception { + public void operationComplete(Future future) { Preconditions.checkState(future.isSuccess(), "Ssl handshake was not successful"); logger.debug("Ssl handshake complete"); start(); } }); - } else + } else { start(); + } } private static Optional getSslHandler(Channel channel) { @@ -93,94 +96,92 @@ public abstract class AbstractNetconfSessionNegotiator

absent() : Optional.of(sslHandler); } + public P getSessionPreferences() { + return sessionPreferences; + } + private void start() { final NetconfMessage helloMessage = this.sessionPreferences.getHelloMessage(); logger.debug("Session negotiation started with hello message {}", XmlUtil.toString(helloMessage.getDocument())); - channel.pipeline().addLast(NAME_OF_EXCEPTION_HANDLER, new ChannelHandler() { - @Override - public void handlerAdded(ChannelHandlerContext ctx) throws Exception { - } - - @Override - public void handlerRemoved(ChannelHandlerContext ctx) throws Exception { - } - - @Override - public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) throws Exception { - logger.warn("An exception occurred during negotiation on channel {}", channel.localAddress(), cause); - cancelTimeout(); - negotiationFailed(cause); - changeState(State.FAILED); - } - }); + channel.pipeline().addLast(NAME_OF_EXCEPTION_HANDLER, new ExceptionHandlingInboundChannelHandler()); timeout = this.timer.newTimeout(new TimerTask() { @Override - public void run(final Timeout timeout) throws Exception { + public void run(final Timeout timeout) { synchronized (this) { if (state != State.ESTABLISHED) { + logger.debug("Connection timeout after {}, session is in state {}", timeout, state); final IllegalStateException cause = new IllegalStateException( "Session was not established after " + timeout); negotiationFailed(cause); changeState(State.FAILED); - } else + } else if(channel.isOpen()) { channel.pipeline().remove(NAME_OF_EXCEPTION_HANDLER); + } } } - }, INITIAL_HOLDTIMER, TimeUnit.MINUTES); + }, connectionTimeoutMillis, TimeUnit.MILLISECONDS); - sendMessage(helloMessage); + // FIXME, make sessionPreferences return HelloMessage, move NetconfHelloMessage to API + sendMessage((NetconfHelloMessage)helloMessage); changeState(State.OPEN_WAIT); } private void cancelTimeout() { - if(timeout!=null) + if(timeout!=null) { timeout.cancel(); - } - - private void sendMessage(NetconfMessage message) { - this.channel.writeAndFlush(message); + } } @Override - protected void handleMessage(NetconfMessage netconfMessage) { + protected void handleMessage(NetconfHelloMessage netconfMessage) { + Preconditions.checkNotNull(netconfMessage != null, "netconfMessage"); + final Document doc = netconfMessage.getDocument(); - if (isHelloMessage(doc)) { - if (containsBase11Capability(doc) - && containsBase11Capability(sessionPreferences.getHelloMessage().getDocument())) { - channel.pipeline().replace("frameEncoder", "frameEncoder", - FramingMechanismHandlerFactory.createHandler(FramingMechanism.CHUNK)); - channel.pipeline().replace("aggregator", "aggregator", - new NetconfMessageAggregator(FramingMechanism.CHUNK)); - channel.pipeline().addAfter("aggregator", "chunkDecoder", new NetconfMessageChunkDecoder()); - } - changeState(State.ESTABLISHED); - S session = getSession(sessionListener, channel, netconfMessage); - negotiationSuccessful(session); - } else { - final IllegalStateException cause = new IllegalStateException( - "Received message was not hello as expected, but was " + XmlUtil.toString(doc)); - logger.warn("Negotiation of netconf session failed", cause); - negotiationFailed(cause); + replaceHelloMessageHandlers(); + + if (shouldUseChunkFraming(doc)) { + insertChunkFramingToPipeline(); } + + changeState(State.ESTABLISHED); + S session = getSession(sessionListener, channel, netconfMessage); + + negotiationSuccessful(session); } - protected abstract S getSession(SessionListener sessionListener, Channel channel, NetconfMessage message); + /** + * Insert chunk framing handlers into the pipeline + */ + private void insertChunkFramingToPipeline() { + replaceChannelHandler(channel, AbstractChannelInitializer.NETCONF_MESSAGE_FRAME_ENCODER, + FramingMechanismHandlerFactory.createHandler(FramingMechanism.CHUNK)); + replaceChannelHandler(channel, AbstractChannelInitializer.NETCONF_MESSAGE_AGGREGATOR, + new NetconfChunkAggregator()); + } - private boolean isHelloMessage(Document doc) { - try { - XmlElement.fromDomElementWithExpected(doc.getDocumentElement(), "hello", - XmlNetconfConstants.URN_IETF_PARAMS_XML_NS_NETCONF_BASE_1_0); + private boolean shouldUseChunkFraming(Document doc) { + return containsBase11Capability(doc) + && containsBase11Capability(sessionPreferences.getHelloMessage().getDocument()); + } - } catch (IllegalArgumentException | IllegalStateException e) { - return false; - } - return true; + /** + * Remove special handlers for hello message. Insert regular netconf xml message (en|de)coders. + */ + private void replaceHelloMessageHandlers() { + replaceChannelHandler(channel, AbstractChannelInitializer.NETCONF_MESSAGE_DECODER, new NetconfXMLToMessageDecoder()); + replaceChannelHandler(channel, AbstractChannelInitializer.NETCONF_MESSAGE_ENCODER, new NetconfMessageToXMLEncoder()); } - private void changeState(final State newState) { + private static ChannelHandler replaceChannelHandler(Channel channel, String handlerKey, ChannelHandler decoder) { + return channel.pipeline().replace(handlerKey, handlerKey, decoder); + } + + protected abstract S getSession(L sessionListener, Channel channel, NetconfHelloMessage message); + + private synchronized void changeState(final State newState) { logger.debug("Changing state from : {} to : {}", state, newState); Preconditions.checkState(isStateChangePermitted(state, newState), "Cannot change state from %s to %s", state, newState); @@ -198,13 +199,31 @@ public abstract class AbstractNetconfSessionNegotiator