[ONOS-5226] Threadpool's name is not appropriate in OSPF-SBI
Change-Id: I567b4eef4dd685428681d562dc4763ac3a00afea
diff --git a/protocols/ospf/ctl/src/main/java/org/onosproject/ospf/controller/impl/Controller.java b/protocols/ospf/ctl/src/main/java/org/onosproject/ospf/controller/impl/Controller.java
index cf24080..86e2a31 100644
--- a/protocols/ospf/ctl/src/main/java/org/onosproject/ospf/controller/impl/Controller.java
+++ b/protocols/ospf/ctl/src/main/java/org/onosproject/ospf/controller/impl/Controller.java
@@ -60,7 +60,7 @@
private OspfInterfaceChannelHandler ospfChannelHandler;
private NioClientSocketChannelFactory peerExecFactory;
private ClientBootstrap peerBootstrap = null;
- private TpPort isisPort = TpPort.tpPort(OspfUtil.SPORT);
+ private TpPort ospfPort = TpPort.tpPort(OspfUtil.SPORT);
private ScheduledExecutorService connectExecutor = null;
private int connectRetryCounter = 0;
private int connectRetryTime;
@@ -70,7 +70,7 @@
/**
* Deactivates OSPF controller.
*/
- public void isisDeactivate() {
+ public void ospfDeactivate() {
peerExecFactory.shutdown();
}
@@ -151,13 +151,13 @@
if (peerWorkerThreads == 0) {
peerExecFactory = new NioClientSocketChannelFactory(
- Executors.newCachedThreadPool(groupedThreads("onos/isis", "boss-%d")),
- Executors.newCachedThreadPool(groupedThreads("onos/isis", "worker-%d")));
+ Executors.newCachedThreadPool(groupedThreads("onos/ospf", "boss-%d")),
+ Executors.newCachedThreadPool(groupedThreads("onos/ospf", "worker-%d")));
return new ClientBootstrap(peerExecFactory);
} else {
peerExecFactory = new NioClientSocketChannelFactory(
- Executors.newCachedThreadPool(groupedThreads("onos/isis", "boss-%d")),
- Executors.newCachedThreadPool(groupedThreads("onos/isis", "worker-%d")),
+ Executors.newCachedThreadPool(groupedThreads("onos/ospf", "boss-%d")),
+ Executors.newCachedThreadPool(groupedThreads("onos/ospf", "worker-%d")),
peerWorkerThreads);
return new ClientBootstrap(peerExecFactory);
}
@@ -235,7 +235,7 @@
*/
public void stop() {
log.info("Stopping OSPF controller...!!!");
- isisDeactivate();
+ ospfDeactivate();
processes.clear();
}
@@ -331,7 +331,7 @@
}
/**
- * Implements ISIS connection and manages connection to peer with back-off mechanism in case of failure.
+ * Implements OSPF connection and manages connection to peer with back-off mechanism in case of failure.
*/
class ConnectionRetry implements Runnable {
@Override
@@ -339,7 +339,7 @@
log.debug("Connect to peer {}", OspfUtil.SHOST);
initConnection();
ospfChannelHandler.sentConfigPacket(configPacket);
- InetSocketAddress connectToSocket = new InetSocketAddress(OspfUtil.SHOST, isisPort.toInt());
+ InetSocketAddress connectToSocket = new InetSocketAddress(OspfUtil.SHOST, ospfPort.toInt());
try {
peerBootstrap.connect(connectToSocket).addListener(new ChannelFutureListener() {
@Override