Bug 8095: Add operational devices to call home collection.

[netconf.git] / netconf / callhome-provider / src / main / java / org / opendaylight / netconf / callhome / mount / CallHomeMountDispatcher.java

diff --git a/netconf/callhome-provider/src/main/java/org/opendaylight/netconf/callhome/mount/CallHomeMountDispatcher.java b/netconf/callhome-provider/src/main/java/org/opendaylight/netconf/callhome/mount/CallHomeMountDispatcher.java
index 807b7a166170833f83abb3bf003bcb87d258a4e0..ee1790ce4514166372743c25787759335652b1fb 100644 (file)
--- a/netconf/callhome-provider/src/main/java/org/opendaylight/netconf/callhome/mount/CallHomeMountDispatcher.java
+++ b/netconf/callhome-provider/src/main/java/org/opendaylight/netconf/callhome/mount/CallHomeMountDispatcher.java
@@ -48,11 +48,9 @@ public class CallHomeMountDispatcher implements NetconfClientDispatcher, CallHom
     private final DataBroker dataBroker;
     private final DOMMountPointService mountService;
 
-
-    private CallHomeTopology topology;
+    protected CallHomeTopology topology;
 
     private final CloseCallback onCloseHandler = new CloseCallback() {
-
         @Override
         public void onClosed(CallHomeMountSessionContext deviceContext) {
             LOG.info("Removing {} from Netconf Topology.", deviceContext.getId());
@@ -60,10 +58,13 @@ public class CallHomeMountDispatcher implements NetconfClientDispatcher, CallHom
         }
     };
 
-
     public CallHomeMountDispatcher(String topologyId, BindingAwareBroker bindingAwareBroker,
-            EventExecutor eventExecutor, ScheduledThreadPool keepaliveExecutor, ThreadPool processingExecutor,
-            SchemaRepositoryProvider schemaRepositoryProvider, Broker domBroker, DataBroker dataBroker, DOMMountPointService mountService) {
+                                   EventExecutor eventExecutor,
+                                   ScheduledThreadPool keepaliveExecutor,
+                                   ThreadPool processingExecutor,
+                                   SchemaRepositoryProvider schemaRepositoryProvider,
+                                   Broker domBroker, DataBroker dataBroker,
+                                   DOMMountPointService mountService) {
         this.topologyId = topologyId;
         this.bindingAwareBroker = bindingAwareBroker;
         this.eventExecutor = eventExecutor;
@@ -76,7 +77,6 @@ public class CallHomeMountDispatcher implements NetconfClientDispatcher, CallHom
         this.mountService = mountService;
     }
 
-
     @Override
     public Future<NetconfClientSession> createClient(NetconfClientConfiguration clientConfiguration) {
         return activateChannel(clientConfiguration);
@@ -89,7 +89,7 @@ public class CallHomeMountDispatcher implements NetconfClientDispatcher, CallHom
 
     private <V> Future<V> activateChannel(NetconfClientConfiguration conf) {
         InetSocketAddress remoteAddr = conf.getAddress();
-        CallHomeMountSessionContext context = sessionManager.getByAddress(remoteAddr);
+        CallHomeMountSessionContext context = getSessionManager().getByAddress(remoteAddr);
         LOG.info("Activating NETCONF channel for ip {} device context {}", remoteAddr, context);
         if (context == null) {
             return new FailedFuture<>(eventExecutor, new NullPointerException());
@@ -103,8 +103,9 @@ public class CallHomeMountDispatcher implements NetconfClientDispatcher, CallHom
     }
 
     @Override
-    public void onNetconfSubsystemOpened(CallHomeProtocolSessionContext session, CallHomeChannelActivator activator) {
-        CallHomeMountSessionContext deviceContext = sessionManager.createSession(session, activator, onCloseHandler);
+    public void onNetconfSubsystemOpened(CallHomeProtocolSessionContext session,
+                                         CallHomeChannelActivator activator) {
+        CallHomeMountSessionContext deviceContext = getSessionManager().createSession(session, activator, onCloseHandler);
         NodeId nodeId = deviceContext.getId();
         Node configNode = deviceContext.getConfigNode();
         LOG.info("Provisioning fake config {}", configNode);