X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fnetconf%2Fnetconf-impl%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fnetconf%2Fimpl%2FNetconfServerSessionNegotiatorFactory.java;h=996bb275877dd74f336db4a410e765fb12f25424;hp=451c066b772f5d705c0904fadd183ef48926a683;hb=4e59b3bd93bc8d7bf1880e98b75c87faab8f61c9;hpb=567b1097ccc247ea1c1bf44f0a4d0ab4b4ebb44c

diff --git a/opendaylight/netconf/netconf-impl/src/main/java/org/opendaylight/controller/netconf/impl/NetconfServerSessionNegotiatorFactory.java b/opendaylight/netconf/netconf-impl/src/main/java/org/opendaylight/controller/netconf/impl/NetconfServerSessionNegotiatorFactory.java
index 451c066b77..996bb27587 100644
--- a/opendaylight/netconf/netconf-impl/src/main/java/org/opendaylight/controller/netconf/impl/NetconfServerSessionNegotiatorFactory.java
+++ b/opendaylight/netconf/netconf-impl/src/main/java/org/opendaylight/controller/netconf/impl/NetconfServerSessionNegotiatorFactory.java
@@ -8,8 +8,6 @@
 
 package org.opendaylight.controller.netconf.impl;
 
-import static org.opendaylight.controller.netconf.mapping.api.NetconfOperationProvider.NetconfOperationProviderUtil.getNetconfSessionIdForReporting;
-
 import com.google.common.base.Preconditions;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Sets;
@@ -19,11 +17,12 @@ import io.netty.util.concurrent.Promise;
 import java.util.Set;
 import org.opendaylight.controller.netconf.api.NetconfDocumentedException;
 import org.opendaylight.controller.netconf.api.NetconfServerSessionPreferences;
+import org.opendaylight.controller.netconf.api.monitoring.NetconfMonitoringService;
 import org.opendaylight.controller.netconf.api.xml.XmlNetconfConstants;
-import org.opendaylight.controller.netconf.impl.mapping.CapabilityProvider;
-import org.opendaylight.controller.netconf.impl.osgi.SessionMonitoringService;
-import org.opendaylight.controller.netconf.mapping.api.NetconfOperationProvider;
-import org.opendaylight.controller.netconf.mapping.api.NetconfOperationServiceSnapshot;
+import org.opendaylight.controller.netconf.impl.osgi.NetconfOperationRouter;
+import org.opendaylight.controller.netconf.impl.osgi.NetconfOperationRouterImpl;
+import org.opendaylight.controller.netconf.mapping.api.NetconfOperationService;
+import org.opendaylight.controller.netconf.mapping.api.NetconfOperationServiceFactory;
 import org.opendaylight.controller.netconf.util.messages.NetconfHelloMessage;
 import org.opendaylight.protocol.framework.SessionListenerFactory;
 import org.opendaylight.protocol.framework.SessionNegotiator;
@@ -42,28 +41,28 @@ public class NetconfServerSessionNegotiatorFactory implements SessionNegotiatorF
     private final Timer timer;
 
     private final SessionIdProvider idProvider;
-    private final NetconfOperationProvider netconfOperationProvider;
+    private final NetconfOperationServiceFactory aggregatedOpService;
     private final long connectionTimeoutMillis;
     private final CommitNotifier commitNotificationProducer;
-    private final SessionMonitoringService monitoringService;
+    private final NetconfMonitoringService monitoringService;
     private static final Logger LOG = LoggerFactory.getLogger(NetconfServerSessionNegotiatorFactory.class);
     private final Set<String> baseCapabilities;
 
     // TODO too many params, refactor
-    public NetconfServerSessionNegotiatorFactory(Timer timer, NetconfOperationProvider netconfOperationProvider,
-                                                 SessionIdProvider idProvider, long connectionTimeoutMillis,
-                                                 CommitNotifier commitNot,
-                                                 SessionMonitoringService monitoringService) {
+    public NetconfServerSessionNegotiatorFactory(final Timer timer, final NetconfOperationServiceFactory netconfOperationProvider,
+                                                 final SessionIdProvider idProvider, final long connectionTimeoutMillis,
+                                                 final CommitNotifier commitNot,
+                                                 final NetconfMonitoringService monitoringService) {
         this(timer, netconfOperationProvider, idProvider, connectionTimeoutMillis, commitNot, monitoringService, DEFAULT_BASE_CAPABILITIES);
     }
 
     // TODO too many params, refactor
-    public NetconfServerSessionNegotiatorFactory(Timer timer, NetconfOperationProvider netconfOperationProvider,
-                                                 SessionIdProvider idProvider, long connectionTimeoutMillis,
-                                                 CommitNotifier commitNot,
-                                                 SessionMonitoringService monitoringService, Set<String> baseCapabilities) {
+    public NetconfServerSessionNegotiatorFactory(final Timer timer, final NetconfOperationServiceFactory netconfOperationProvider,
+                                                 final SessionIdProvider idProvider, final long connectionTimeoutMillis,
+                                                 final CommitNotifier commitNot,
+                                                 final NetconfMonitoringService monitoringService, final Set<String> baseCapabilities) {
         this.timer = timer;
-        this.netconfOperationProvider = netconfOperationProvider;
+        this.aggregatedOpService = netconfOperationProvider;
         this.idProvider = idProvider;
         this.connectionTimeoutMillis = connectionTimeoutMillis;
         this.commitNotificationProducer = commitNot;
@@ -73,12 +72,12 @@ public class NetconfServerSessionNegotiatorFactory implements SessionNegotiatorF
 
     private ImmutableSet<String> validateBaseCapabilities(final Set<String> baseCapabilities) {
         // Check base capabilities to be supported by the server
-        Sets.SetView<String> unknownBaseCaps = Sets.difference(baseCapabilities, DEFAULT_BASE_CAPABILITIES);
+        final Sets.SetView<String> unknownBaseCaps = Sets.difference(baseCapabilities, DEFAULT_BASE_CAPABILITIES);
         Preconditions.checkArgument(unknownBaseCaps.isEmpty(),
                 "Base capabilities that will be supported by netconf server have to be subset of %s, unknown base capabilities: %s",
                 DEFAULT_BASE_CAPABILITIES, unknownBaseCaps);
 
-        ImmutableSet.Builder<String> b = ImmutableSet.builder();
+        final ImmutableSet.Builder<String> b = ImmutableSet.builder();
         b.addAll(baseCapabilities);
         // Base 1.0 capability is supported by default
         b.add(XmlNetconfConstants.URN_IETF_PARAMS_NETCONF_BASE_1_0);
@@ -95,31 +94,32 @@ public class NetconfServerSessionNegotiatorFactory implements SessionNegotiatorF
      * @return session negotiator
      */
     @Override
-    public SessionNegotiator<NetconfServerSession> getSessionNegotiator(SessionListenerFactory<NetconfServerSessionListener> defunctSessionListenerFactory,
-                                                                        Channel channel, Promise<NetconfServerSession> promise) {
-        long sessionId = idProvider.getNextSessionId();
-        NetconfOperationServiceSnapshot netconfOperationServiceSnapshot = netconfOperationProvider.openSnapshot(
-                getNetconfSessionIdForReporting(sessionId));
-        CapabilityProvider capabilityProvider = new CapabilityProviderImpl(netconfOperationServiceSnapshot);
-
-        NetconfServerSessionPreferences proposal = null;
+    public SessionNegotiator<NetconfServerSession> getSessionNegotiator(final SessionListenerFactory<NetconfServerSessionListener> defunctSessionListenerFactory,
+                                                                        final Channel channel, final Promise<NetconfServerSession> promise) {
+        final long sessionId = idProvider.getNextSessionId();
+
+        NetconfServerSessionPreferences proposal;
         try {
-            proposal = new NetconfServerSessionPreferences(
-                    createHelloMessage(sessionId, capabilityProvider), sessionId);
-        } catch (NetconfDocumentedException e) {
-            LOG.error("Unable to create hello mesage for session {} with capability provider {}", sessionId,capabilityProvider);
+            proposal = new NetconfServerSessionPreferences(createHelloMessage(sessionId, monitoringService), sessionId);
+        } catch (final NetconfDocumentedException e) {
+            LOG.error("Unable to create hello message for session {} with {}", sessionId, monitoringService);
             throw new IllegalStateException(e);
         }
 
-        NetconfServerSessionListenerFactory sessionListenerFactory = new NetconfServerSessionListenerFactory(
-                commitNotificationProducer, monitoringService,
-                netconfOperationServiceSnapshot, capabilityProvider);
-
         return new NetconfServerSessionNegotiator(proposal, promise, channel, timer,
-                sessionListenerFactory.getSessionListener(), connectionTimeoutMillis);
+                getListener(Long.toString(sessionId)), connectionTimeoutMillis);
+    }
+
+    private NetconfServerSessionListener getListener(final String netconfSessionIdForReporting) {
+        final NetconfOperationService service =
+                this.aggregatedOpService.createService(netconfSessionIdForReporting);
+        final NetconfOperationRouter operationRouter =
+                new NetconfOperationRouterImpl(service, commitNotificationProducer, monitoringService, netconfSessionIdForReporting);
+        return new NetconfServerSessionListener(operationRouter, monitoringService, service);
+
     }
 
-    private NetconfHelloMessage createHelloMessage(long sessionId, CapabilityProvider capabilityProvider) throws NetconfDocumentedException {
+    private NetconfHelloMessage createHelloMessage(final long sessionId, final NetconfMonitoringService capabilityProvider) throws NetconfDocumentedException {
         return NetconfHelloMessage.createServerHello(Sets.union(capabilityProvider.getCapabilities(), baseCapabilities), sessionId);
     }