X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=netconf%2Ftools%2Fnetconf-testtool%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fnetconf%2Ftest%2Ftool%2FNetconfDeviceSimulator.java;h=1e2a2002939158c99dac83b75952d779de1d8af5;hb=fdc5756e29c8f0717fd3c178ca201d07338f98c1;hp=33c4d9c0fc6b6ffad41f15bec7964c491e1227ee;hpb=3b4f0880195460f9d9a00cc6bf4bc319f81e5bb7;p=netconf.git diff --git a/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/NetconfDeviceSimulator.java b/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/NetconfDeviceSimulator.java index 33c4d9c0fc..1e2a200293 100644 --- a/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/NetconfDeviceSimulator.java +++ b/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/NetconfDeviceSimulator.java @@ -12,7 +12,6 @@ import static java.util.Objects.requireNonNullElseGet; import com.google.common.collect.Collections2; import com.google.common.collect.ImmutableList; import com.google.common.util.concurrent.Futures; -import io.netty.util.HashedWheelTimer; import java.io.Closeable; import java.io.IOException; import java.net.InetAddress; @@ -27,6 +26,7 @@ import java.util.concurrent.ExecutionException; import java.util.stream.IntStream; import org.opendaylight.netconf.api.CapabilityURN; import org.opendaylight.netconf.api.TransportConstants; +import org.opendaylight.netconf.common.impl.DefaultNetconfTimer; import org.opendaylight.netconf.server.ServerTransportInitializer; import org.opendaylight.netconf.server.api.SessionIdProvider; import org.opendaylight.netconf.server.api.monitoring.BasicCapability; @@ -77,7 +77,7 @@ import org.slf4j.LoggerFactory; public class NetconfDeviceSimulator implements Closeable { private static final Logger LOG = LoggerFactory.getLogger(NetconfDeviceSimulator.class); - private final HashedWheelTimer hashedWheelTimer = new HashedWheelTimer(); + private final DefaultNetconfTimer timer = new DefaultNetconfTimer(); private final Configuration configuration; private final List servers; private final SSHTransportStackFactory sshStackFactory; @@ -109,8 +109,8 @@ public class NetconfDeviceSimulator implements Closeable { final var aggregatedNetconfOperationServiceFactory = createOperationServiceFactory( sourceProvider, transformedCapabilities, monitoringService1, idProvider); - return new ServerTransportInitializer(new TesttoolNegotiationFactory( - hashedWheelTimer, aggregatedNetconfOperationServiceFactory, idProvider, + return new ServerTransportInitializer(new TesttoolNegotiationFactory(timer, + aggregatedNetconfOperationServiceFactory, idProvider, configuration.getGenerateConfigsTimeout(), monitoringService1, configuration.getCapabilities())); }