Use Timer for KeepaliveSalFacade

[netconf.git] / apps / netconf-topology-singleton / src / test / java / org / opendaylight / netconf / topology / singleton / impl / MountPointEndToEndTest.java

diff --git a/apps/netconf-topology-singleton/src/test/java/org/opendaylight/netconf/topology/singleton/impl/MountPointEndToEndTest.java b/apps/netconf-topology-singleton/src/test/java/org/opendaylight/netconf/topology/singleton/impl/MountPointEndToEndTest.java
index 477f85bde951957363d1e1adb0d408aa06d17ddf..5f10f89e928c589dfd33ac60fc91fa164568b9ec 100644 (file)
--- a/apps/netconf-topology-singleton/src/test/java/org/opendaylight/netconf/topology/singleton/impl/MountPointEndToEndTest.java
+++ b/apps/netconf-topology-singleton/src/test/java/org/opendaylight/netconf/topology/singleton/impl/MountPointEndToEndTest.java
@@ -33,8 +33,7 @@ import com.google.common.util.concurrent.ListenableFuture;
 import com.google.common.util.concurrent.MoreExecutors;
 import com.google.common.util.concurrent.SettableFuture;
 import com.typesafe.config.ConfigFactory;
-import io.netty.util.concurrent.EventExecutor;
-import io.netty.util.concurrent.GlobalEventExecutor;
+import io.netty.util.Timer;
 import java.io.File;
 import java.util.Iterator;
 import java.util.List;
@@ -183,16 +182,26 @@ public class MountPointEndToEndTest extends AbstractBaseSchemasTest {
     private static final String TEST_ROOT_DIRECTORY = "test-cache-root";
     private static final String TEST_DEFAULT_SUBDIR = "test-schema";
 
-    @Mock private RpcProviderService mockRpcProviderService;
-    @Mock private Registration mockRpcReg;
-    @Mock private NetconfClientFactory mockClientFactory;
-    @Mock private AAAEncryptionService mockEncryptionService;
-    @Mock private ScheduledExecutorService mockKeepaliveExecutor;
-    @Mock private DeviceActionFactory deviceActionFactory;
-    @Mock private CredentialProvider credentialProvider;
-    @Mock private SslHandlerFactoryProvider sslHandlerFactoryProvider;
-
-    @Mock private DOMMountPointListener masterMountPointListener;
+    @Mock
+    private RpcProviderService mockRpcProviderService;
+    @Mock
+    private Registration mockRpcReg;
+    @Mock
+    private NetconfClientFactory mockClientFactory;
+    @Mock
+    private AAAEncryptionService mockEncryptionService;
+    @Mock
+    private Timer mockTimer;
+    @Mock
+    private ScheduledExecutorService mockKeepaliveExecutor;
+    @Mock
+    private DeviceActionFactory deviceActionFactory;
+    @Mock
+    private CredentialProvider credentialProvider;
+    @Mock
+    private SslHandlerFactoryProvider sslHandlerFactoryProvider;
+    @Mock
+    private DOMMountPointListener masterMountPointListener;
     private final DOMMountPointService masterMountPointService = new DOMMountPointServiceImpl();
     private Rpcs.Normalized deviceRpcService;
 
@@ -204,9 +213,12 @@ public class MountPointEndToEndTest extends AbstractBaseSchemasTest {
 
     private volatile SettableFuture<MasterSalFacade> masterSalFacadeFuture = SettableFuture.create();
 
-    @Mock private ClusterSingletonServiceProvider mockSlaveClusterSingletonServiceProvider;
-    @Mock private ClusterSingletonServiceRegistration mockSlaveClusterSingletonServiceReg;
-    @Mock private DOMMountPointListener slaveMountPointListener;
+    @Mock
+    private ClusterSingletonServiceProvider mockSlaveClusterSingletonServiceProvider;
+    @Mock
+    private ClusterSingletonServiceRegistration mockSlaveClusterSingletonServiceReg;
+    @Mock
+    private DOMMountPointListener slaveMountPointListener;
     private final DOMMountPointService slaveMountPointService = new DOMMountPointServiceImpl();
     private DataBroker slaveDataBroker;
     private ActorSystem slaveSystem;
@@ -215,7 +227,6 @@ public class MountPointEndToEndTest extends AbstractBaseSchemasTest {
     private TransactionChain slaveTxChain;
 
     private NetconfClientConfigurationBuilderFactory builderFactory;
-    private final EventExecutor eventExecutor = GlobalEventExecutor.INSTANCE;
     private EffectiveModelContext deviceSchemaContext;
     private YangModuleInfo topModuleInfo;
     private QName putTopRpcSchemaPath;
@@ -306,10 +317,9 @@ public class MountPointEndToEndTest extends AbstractBaseSchemasTest {
                 YangTextSchemaSource.class, 1));
 
         masterNetconfTopologyManager = new NetconfTopologyManager(BASE_SCHEMAS, masterDataBroker,
-                masterClusterSingletonServiceProvider, mockKeepaliveExecutor, MoreExecutors.directExecutor(),
-                masterSystem, eventExecutor, mockClientFactory, masterMountPointService,
-                mockEncryptionService, mockRpcProviderService, deviceActionFactory, resourceManager, builderFactory,
-                TOPOLOGY_ID, Uint16.ZERO) {
+                masterClusterSingletonServiceProvider, mockTimer, mockKeepaliveExecutor, MoreExecutors.directExecutor(),
+                masterSystem, mockClientFactory, masterMountPointService, mockEncryptionService, mockRpcProviderService,
+                deviceActionFactory, resourceManager, builderFactory, TOPOLOGY_ID, Uint16.ZERO) {
             @Override
             protected NetconfTopologyContext newNetconfTopologyContext(final NetconfTopologySetup setup,
                     final ServiceGroupIdentifier serviceGroupIdent, final Timeout actorResponseWaitTime,
@@ -343,8 +353,8 @@ public class MountPointEndToEndTest extends AbstractBaseSchemasTest {
                 .registerClusterSingletonService(any());
 
         slaveNetconfTopologyManager = new NetconfTopologyManager(BASE_SCHEMAS, slaveDataBroker,
-                mockSlaveClusterSingletonServiceProvider, mockKeepaliveExecutor, MoreExecutors.directExecutor(),
-                slaveSystem, eventExecutor, mockClientFactory, slaveMountPointService,
+                mockSlaveClusterSingletonServiceProvider, mockTimer, mockKeepaliveExecutor,
+                MoreExecutors.directExecutor(), slaveSystem, mockClientFactory, slaveMountPointService,
                 mockEncryptionService, mockRpcProviderService, deviceActionFactory, resourceManager, builderFactory,
                 TOPOLOGY_ID, Uint16.ZERO) {
             @Override
@@ -364,6 +374,7 @@ public class MountPointEndToEndTest extends AbstractBaseSchemasTest {
         slaveTxChain = slaveDataBroker.createTransactionChain(new TransactionChainListener() {
             @Override
             public void onTransactionChainSuccessful(final TransactionChain chain) {
+                // No-op
             }
 
             @Override