Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Initial message bus implementation"
[controller.git]
/
opendaylight
/
netconf
/
netconf-impl
/
src
/
main
/
java
/
org
/
opendaylight
/
controller
/
netconf
/
impl
/
osgi
/
NetconfImplActivator.java
diff --git
a/opendaylight/netconf/netconf-impl/src/main/java/org/opendaylight/controller/netconf/impl/osgi/NetconfImplActivator.java
b/opendaylight/netconf/netconf-impl/src/main/java/org/opendaylight/controller/netconf/impl/osgi/NetconfImplActivator.java
index bbd07e42bf515c46dec0a6900bd2105f3140596f..a55e32a954ad99a85521e11f541567c962a20b84 100644
(file)
--- a/
opendaylight/netconf/netconf-impl/src/main/java/org/opendaylight/controller/netconf/impl/osgi/NetconfImplActivator.java
+++ b/
opendaylight/netconf/netconf-impl/src/main/java/org/opendaylight/controller/netconf/impl/osgi/NetconfImplActivator.java
@@
-7,11
+7,16
@@
*/
package org.opendaylight.controller.netconf.impl.osgi;
*/
package org.opendaylight.controller.netconf.impl.osgi;
+import io.netty.channel.local.LocalAddress;
import io.netty.channel.nio.NioEventLoopGroup;
import io.netty.util.HashedWheelTimer;
import io.netty.channel.nio.NioEventLoopGroup;
import io.netty.util.HashedWheelTimer;
+import java.lang.management.ManagementFactory;
+import java.util.Dictionary;
+import java.util.Hashtable;
+import java.util.concurrent.TimeUnit;
import org.opendaylight.controller.netconf.api.monitoring.NetconfMonitoringService;
import org.opendaylight.controller.netconf.impl.DefaultCommitNotificationProducer;
import org.opendaylight.controller.netconf.api.monitoring.NetconfMonitoringService;
import org.opendaylight.controller.netconf.impl.DefaultCommitNotificationProducer;
-import org.opendaylight.controller.netconf.impl.NetconfServerDispatcher;
+import org.opendaylight.controller.netconf.impl.NetconfServerDispatcher
Impl
;
import org.opendaylight.controller.netconf.impl.NetconfServerSessionNegotiatorFactory;
import org.opendaylight.controller.netconf.impl.SessionIdProvider;
import org.opendaylight.controller.netconf.mapping.api.NetconfOperationProvider;
import org.opendaylight.controller.netconf.impl.NetconfServerSessionNegotiatorFactory;
import org.opendaylight.controller.netconf.impl.SessionIdProvider;
import org.opendaylight.controller.netconf.mapping.api.NetconfOperationProvider;
@@
-22,15
+27,9
@@
import org.osgi.framework.ServiceRegistration;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import java.lang.management.ManagementFactory;
-import java.net.InetSocketAddress;
-import java.util.Dictionary;
-import java.util.Hashtable;
-import java.util.concurrent.TimeUnit;
-
public class NetconfImplActivator implements BundleActivator {
public class NetconfImplActivator implements BundleActivator {
- private static final Logger
logger
= LoggerFactory.getLogger(NetconfImplActivator.class);
+ private static final Logger
LOG
= LoggerFactory.getLogger(NetconfImplActivator.class);
private NetconfOperationServiceFactoryTracker factoriesTracker;
private DefaultCommitNotificationProducer commitNot;
private NetconfOperationServiceFactoryTracker factoriesTracker;
private DefaultCommitNotificationProducer commitNot;
@@
-39,9
+38,7
@@
public class NetconfImplActivator implements BundleActivator {
private ServiceRegistration<NetconfMonitoringService> regMonitoring;
@Override
private ServiceRegistration<NetconfMonitoringService> regMonitoring;
@Override
- public void start(final BundleContext context) throws Exception {
- InetSocketAddress address = NetconfConfigUtil.extractTCPNetconfAddress(context,
- "TCP is not configured, netconf not available.", false);
+ public void start(final BundleContext context) {
NetconfOperationServiceFactoryListenerImpl factoriesListener = new NetconfOperationServiceFactoryListenerImpl();
startOperationServiceFactoryTracker(context, factoriesListener);
NetconfOperationServiceFactoryListenerImpl factoriesListener = new NetconfOperationServiceFactoryListenerImpl();
startOperationServiceFactoryTracker(context, factoriesListener);
@@
-60,12
+57,13
@@
public class NetconfImplActivator implements BundleActivator {
eventLoopGroup = new NioEventLoopGroup();
eventLoopGroup = new NioEventLoopGroup();
- NetconfServerDispatcher
.ServerChannelInitializer serverChannelInitializer = new NetconfServerDispatcher
.ServerChannelInitializer(
+ NetconfServerDispatcher
Impl.ServerChannelInitializer serverChannelInitializer = new NetconfServerDispatcherImpl
.ServerChannelInitializer(
serverNegotiatorFactory);
serverNegotiatorFactory);
- NetconfServerDispatcher
dispatch = new NetconfServerDispatcher
(serverChannelInitializer, eventLoopGroup, eventLoopGroup);
+ NetconfServerDispatcher
Impl dispatch = new NetconfServerDispatcherImpl
(serverChannelInitializer, eventLoopGroup, eventLoopGroup);
- logger.info("Starting TCP netconf server at {}", address);
- dispatch.createServer(address);
+ LocalAddress address = NetconfConfigUtil.getNetconfLocalAddress();
+ LOG.trace("Starting local netconf server at {}", address);
+ dispatch.createLocalServer(address);
context.registerService(NetconfOperationProvider.class, factoriesListener, null);
context.registerService(NetconfOperationProvider.class, factoriesListener, null);
@@
-85,8
+83,8
@@
public class NetconfImplActivator implements BundleActivator {
}
@Override
}
@Override
- public void stop(final BundleContext context)
throws Exception
{
-
logger
.info("Shutting down netconf because YangStoreService service was removed");
+ public void stop(final BundleContext context) {
+
LOG
.info("Shutting down netconf because YangStoreService service was removed");
commitNot.close();
eventLoopGroup.shutdownGracefully(0, 1, TimeUnit.SECONDS);
commitNot.close();
eventLoopGroup.shutdownGracefully(0, 1, TimeUnit.SECONDS);