Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Decouple config and netconf subsystems.
[controller.git]
/
opendaylight
/
netconf
/
netconf-impl
/
src
/
test
/
java
/
org
/
opendaylight
/
controller
/
netconf
/
impl
/
NetconfDispatcherImplTest.java
diff --git
a/opendaylight/netconf/netconf-impl/src/test/java/org/opendaylight/controller/netconf/impl/NetconfDispatcherImplTest.java
b/opendaylight/netconf/netconf-impl/src/test/java/org/opendaylight/controller/netconf/impl/NetconfDispatcherImplTest.java
index ecc33ca90fd05f5392d6173c6d88cd4a7a36128c..d7d679bcafc97db9d241fd7575b4e030b1940314 100644
(file)
--- a/
opendaylight/netconf/netconf-impl/src/test/java/org/opendaylight/controller/netconf/impl/NetconfDispatcherImplTest.java
+++ b/
opendaylight/netconf/netconf-impl/src/test/java/org/opendaylight/controller/netconf/impl/NetconfDispatcherImplTest.java
@@
-12,18
+12,16
@@
import io.netty.channel.ChannelFuture;
import io.netty.channel.EventLoopGroup;
import io.netty.channel.nio.NioEventLoopGroup;
import io.netty.util.HashedWheelTimer;
import io.netty.channel.EventLoopGroup;
import io.netty.channel.nio.NioEventLoopGroup;
import io.netty.util.HashedWheelTimer;
-import java.lang.management.ManagementFactory;
import java.net.InetSocketAddress;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import java.net.InetSocketAddress;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import org.opendaylight.controller.netconf.impl.osgi.
NetconfOperationServiceFactoryListenerImpl
;
+import org.opendaylight.controller.netconf.impl.osgi.
AggregatedNetconfOperationServiceFactory
;
public class NetconfDispatcherImplTest {
private EventLoopGroup nettyGroup;
public class NetconfDispatcherImplTest {
private EventLoopGroup nettyGroup;
- private NetconfServerDispatcher dispatch;
- private DefaultCommitNotificationProducer commitNot;
+ private NetconfServerDispatcherImpl dispatch;
private HashedWheelTimer hashedWheelTimer;
private HashedWheelTimer hashedWheelTimer;
@@
-31,25
+29,22
@@
public class NetconfDispatcherImplTest {
public void setUp() throws Exception {
nettyGroup = new NioEventLoopGroup();
public void setUp() throws Exception {
nettyGroup = new NioEventLoopGroup();
- commitNot = new DefaultCommitNotificationProducer(
- ManagementFactory.getPlatformMBeanServer());
- NetconfOperationServiceFactoryListenerImpl factoriesListener = new NetconfOperationServiceFactoryListenerImpl();
+ AggregatedNetconfOperationServiceFactory factoriesListener = new AggregatedNetconfOperationServiceFactory();
SessionIdProvider idProvider = new SessionIdProvider();
hashedWheelTimer = new HashedWheelTimer();
NetconfServerSessionNegotiatorFactory serverNegotiatorFactory = new NetconfServerSessionNegotiatorFactory(
SessionIdProvider idProvider = new SessionIdProvider();
hashedWheelTimer = new HashedWheelTimer();
NetconfServerSessionNegotiatorFactory serverNegotiatorFactory = new NetconfServerSessionNegotiatorFactory(
- hashedWheelTimer, factoriesListener, idProvider, 5000,
commitNot,
ConcurrentClientsTest.createMockedMonitoringService());
+ hashedWheelTimer, factoriesListener, idProvider, 5000, ConcurrentClientsTest.createMockedMonitoringService());
- NetconfServerDispatcher
.ServerChannelInitializer serverChannelInitializer = new NetconfServerDispatcher
.ServerChannelInitializer(serverNegotiatorFactory);
+ NetconfServerDispatcher
Impl.ServerChannelInitializer serverChannelInitializer = new NetconfServerDispatcherImpl
.ServerChannelInitializer(serverNegotiatorFactory);
- dispatch = new NetconfServerDispatcher(
+ dispatch = new NetconfServerDispatcher
Impl
(
serverChannelInitializer, nettyGroup, nettyGroup);
}
@After
public void tearDown() throws Exception {
hashedWheelTimer.stop();
serverChannelInitializer, nettyGroup, nettyGroup);
}
@After
public void tearDown() throws Exception {
hashedWheelTimer.stop();
- commitNot.close();
nettyGroup.shutdownGracefully();
}
nettyGroup.shutdownGracefully();
}