Integrate netconf-mapping-api into netconf-server

[netconf.git] / netconf / tools / netconf-testtool / src / main / java / org / opendaylight / netconf / test / tool / TesttoolNegotiationFactory.java

diff --git a/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/TesttoolNegotiationFactory.java b/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/TesttoolNegotiationFactory.java
index d94c0ad158eed22eedfe1fd666a7ae4797b7be45..06139187607befc745da256330aca93564a4ca91 100644 (file)
--- a/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/TesttoolNegotiationFactory.java
+++ b/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/TesttoolNegotiationFactory.java
@@ -14,34 +14,45 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.Set;
 import org.opendaylight.netconf.api.monitoring.NetconfMonitoringService;
-import org.opendaylight.netconf.impl.NetconfServerSessionNegotiatorFactory;
-import org.opendaylight.netconf.impl.SessionIdProvider;
-import org.opendaylight.netconf.mapping.api.NetconfOperationService;
-import org.opendaylight.netconf.mapping.api.NetconfOperationServiceFactory;
+import org.opendaylight.netconf.server.NetconfServerSessionNegotiatorFactory;
+import org.opendaylight.netconf.server.api.SessionIdProvider;
+import org.opendaylight.netconf.server.api.operations.NetconfOperationService;
+import org.opendaylight.netconf.server.api.operations.NetconfOperationServiceFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class TesttoolNegotiationFactory extends NetconfServerSessionNegotiatorFactory {
+    private static final Logger LOG = LoggerFactory.getLogger(TesttoolNegotiationFactory.class);
 
     private final Map<SocketAddress, NetconfOperationService> cachedOperationServices = new HashMap<>();
 
     public TesttoolNegotiationFactory(final Timer timer, final NetconfOperationServiceFactory netconfOperationProvider,
-                                      final SessionIdProvider idProvider, final long connectionTimeoutMillis,
-                                      final NetconfMonitoringService monitoringService) {
-        super(timer, netconfOperationProvider, idProvider, connectionTimeoutMillis, monitoringService);
+            final SessionIdProvider idProvider, final long connectionTimeoutMillis,
+            final NetconfMonitoringService monitoringService) {
+        super(timer, netconfOperationProvider, idProvider, connectionTimeoutMillis, monitoringService,
+            NetconfServerSessionNegotiatorFactory.DEFAULT_BASE_CAPABILITIES);
     }
 
     public TesttoolNegotiationFactory(final Timer timer, final NetconfOperationServiceFactory netconfOperationProvider,
-                                      final SessionIdProvider idProvider, final long connectionTimeoutMillis,
-                                      final NetconfMonitoringService monitoringService, final Set<String> baseCapabilities) {
-        super(timer, netconfOperationProvider, idProvider, connectionTimeoutMillis, monitoringService, baseCapabilities);
+            final SessionIdProvider idProvider, final long connectionTimeoutMillis,
+            final NetconfMonitoringService monitoringService, final Set<String> baseCapabilities) {
+        super(timer, netconfOperationProvider, idProvider, connectionTimeoutMillis,
+            monitoringService, baseCapabilities);
     }
 
     @Override
-    protected NetconfOperationService getOperationServiceForAddress(final String netconfSessionIdForReporting, final SocketAddress socketAddress) {
+    protected NetconfOperationService getOperationServiceForAddress(
+            final String netconfSessionIdForReporting, final SocketAddress socketAddress) {
         if (cachedOperationServices.containsKey(socketAddress)) {
+            LOG.debug("Session {}: Getting cached operation service factory for test tool device on address {}",
+                    netconfSessionIdForReporting, socketAddress);
             return cachedOperationServices.get(socketAddress);
         } else {
-            final NetconfOperationService service = getOperationServiceFactory().createService(netconfSessionIdForReporting);
+            final NetconfOperationService service = getOperationServiceFactory()
+                .createService(netconfSessionIdForReporting);
             cachedOperationServices.put(socketAddress, service);
+            LOG.debug("Session {}: Creating new operation service factory for test tool device on address {}",
+                    netconfSessionIdForReporting, socketAddress);
             return service;
         }
     }