All openflow nodes are not getting listed in the output of getallnodes in controller...

[openflowplugin.git] / openflowplugin-impl / src / main / java / org / opendaylight / openflowplugin / impl / device / DeviceManagerImpl.java

diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/device/DeviceManagerImpl.java b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/device/DeviceManagerImpl.java
index dd64f5722a3e82f2f2fc41ae3d8e94b836548fb8..ab75ce3b82106dc81d74d33dbf25526997f14007 100644 (file)
--- a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/device/DeviceManagerImpl.java
+++ b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/device/DeviceManagerImpl.java
@@ -12,9 +12,10 @@ import io.netty.util.HashedWheelTimer;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
+import java.util.concurrent.ExecutorService;
 import java.util.concurrent.ScheduledThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
-import javax.annotation.Nonnull;
+import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.mdsal.binding.api.DataBroker;
 import org.opendaylight.mdsal.binding.api.NotificationPublishService;
 import org.opendaylight.mdsal.binding.api.WriteTransaction;
@@ -43,6 +44,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.NodeUpd
 import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.Node;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.NodeKey;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.openflow.provider.config.rev160510.OpenflowProviderConfig;
+import org.opendaylight.yangtools.util.concurrent.QueuedNotificationManager;
 import org.opendaylight.yangtools.yang.binding.KeyedInstanceIdentifier;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -67,14 +69,16 @@ public class DeviceManagerImpl implements DeviceManager, ExtensionConverterProvi
     private ExtensionConverterProvider extensionConverterProvider;
     private ScheduledThreadPoolExecutor spyPool;
     private ContextChainHolder contextChainHolder;
-
-    public DeviceManagerImpl(@Nonnull final OpenflowProviderConfig config,
-                             @Nonnull final DataBroker dataBroker,
-                             @Nonnull final MessageSpy messageSpy,
-                             @Nonnull final NotificationPublishService notificationPublishService,
-                             @Nonnull final HashedWheelTimer hashedWheelTimer,
-                             @Nonnull final ConvertorExecutor convertorExecutor,
-                             @Nonnull final DeviceInitializerProvider deviceInitializerProvider) {
+    private final QueuedNotificationManager<String, Runnable> queuedNotificationManager;
+
+    public DeviceManagerImpl(@NonNull final OpenflowProviderConfig config,
+                             @NonNull final DataBroker dataBroker,
+                             @NonNull final MessageSpy messageSpy,
+                             @NonNull final NotificationPublishService notificationPublishService,
+                             @NonNull final HashedWheelTimer hashedWheelTimer,
+                             @NonNull final ConvertorExecutor convertorExecutor,
+                             @NonNull final DeviceInitializerProvider deviceInitializerProvider,
+                             @NonNull final ExecutorService executorService) {
         this.config = config;
         this.dataBroker = dataBroker;
         this.deviceInitializerProvider = deviceInitializerProvider;
@@ -84,6 +88,9 @@ public class DeviceManagerImpl implements DeviceManager, ExtensionConverterProvi
         this.notificationPublishService = notificationPublishService;
         this.messageSpy = messageSpy;
         DeviceInitializationUtil.makeEmptyNodes(dataBroker);
+        this.queuedNotificationManager =  QueuedNotificationManager.create(executorService, (key, entries) -> {
+            entries.forEach(jobEntry -> jobEntry.run());
+        }, 2048, "port-status-queue");
     }
 
     @Override
@@ -122,7 +129,7 @@ public class DeviceManagerImpl implements DeviceManager, ExtensionConverterProvi
     }
 
     @Override
-    public ListenableFuture<?> removeDeviceFromOperationalDS(@Nonnull final KeyedInstanceIdentifier<Node, NodeKey> ii) {
+    public ListenableFuture<?> removeDeviceFromOperationalDS(@NonNull final KeyedInstanceIdentifier<Node, NodeKey> ii) {
 
         final WriteTransaction delWtx = dataBroker.newWriteOnlyTransaction();
         delWtx.delete(LogicalDatastoreType.OPERATIONAL, ii);
@@ -131,7 +138,7 @@ public class DeviceManagerImpl implements DeviceManager, ExtensionConverterProvi
     }
 
     @Override
-    public DeviceContext createContext(@Nonnull final ConnectionContext connectionContext) {
+    public DeviceContext createContext(@NonNull final ConnectionContext connectionContext) {
 
         LOG.info("ConnectionEvent: Device connected to controller, Device:{}, NodeId:{}",
                 connectionContext.getConnectionAdapter().getRemoteAddress(),
@@ -146,8 +153,8 @@ public class DeviceManagerImpl implements DeviceManager, ExtensionConverterProvi
         final OutboundQueueHandlerRegistration<OutboundQueueProvider> outboundQueueHandlerRegistration =
                 connectionContext.getConnectionAdapter().registerOutboundQueueHandler(
                         outboundQueueProvider,
-                        config.getBarrierCountLimit().getValue(),
-                        TimeUnit.MILLISECONDS.toNanos(config.getBarrierIntervalTimeoutLimit().getValue()));
+                        config.getBarrierCountLimit().getValue().toJava(),
+                        TimeUnit.MILLISECONDS.toNanos(config.getBarrierIntervalTimeoutLimit().getValue().toJava()));
         connectionContext.setOutboundQueueHandleRegistration(outboundQueueHandlerRegistration);
 
 
@@ -163,8 +170,9 @@ public class DeviceManagerImpl implements DeviceManager, ExtensionConverterProvi
                 deviceInitializerProvider,
                 config.isEnableFlowRemovedNotification(),
                 config.isSwitchFeaturesMandatory(),
-                contextChainHolder);
-
+                contextChainHolder,
+                queuedNotificationManager,
+                config.isIsStatisticsPollingOn());
         ((ExtensionConverterProviderKeeper) deviceContext).setExtensionConverterProvider(extensionConverterProvider);
         deviceContext.setNotificationPublishService(notificationPublishService);
 
@@ -184,7 +192,7 @@ public class DeviceManagerImpl implements DeviceManager, ExtensionConverterProvi
         synchronized (updatePacketInRateLimitersLock) {
             final int deviceContextsSize = deviceContexts.size();
             if (deviceContextsSize > 0) {
-                long freshNotificationLimit = config.getGlobalNotificationQuota() / deviceContextsSize;
+                long freshNotificationLimit = config.getGlobalNotificationQuota().toJava() / deviceContextsSize;
                 if (freshNotificationLimit < 100) {
                     freshNotificationLimit = 100;
                 }
@@ -204,12 +212,11 @@ public class DeviceManagerImpl implements DeviceManager, ExtensionConverterProvi
         if (LOG.isDebugEnabled()) {
             LOG.debug("Device context removed for node {}", deviceInfo);
         }
-
         this.updatePacketInRateLimiters();
     }
 
     @Override
-    public void sendNodeRemovedNotification(@Nonnull final KeyedInstanceIdentifier<Node, NodeKey> instanceIdentifier) {
+    public void sendNodeRemovedNotification(@NonNull final KeyedInstanceIdentifier<Node, NodeKey> instanceIdentifier) {
         if (notificationCreateNodeSend.remove(instanceIdentifier)) {
             NodeRemovedBuilder builder = new NodeRemovedBuilder();
             builder.setNodeRef(new NodeRef(instanceIdentifier));
@@ -219,12 +226,12 @@ public class DeviceManagerImpl implements DeviceManager, ExtensionConverterProvi
     }
 
     @Override
-    public void setContextChainHolder(@Nonnull ContextChainHolder contextChainHolder) {
+    public void setContextChainHolder(@NonNull final ContextChainHolder contextChainHolder) {
         this.contextChainHolder = contextChainHolder;
     }
 
     @Override
-    public void sendNodeAddedNotification(@Nonnull final KeyedInstanceIdentifier<Node, NodeKey> instanceIdentifier) {
+    public void sendNodeAddedNotification(@NonNull final KeyedInstanceIdentifier<Node, NodeKey> instanceIdentifier) {
         if (!notificationCreateNodeSend.contains(instanceIdentifier)) {
             notificationCreateNodeSend.add(instanceIdentifier);
             final NodeId id = instanceIdentifier.firstKeyOf(Node.class).getId();