Code Review / openflowplugin.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
Device state
[openflowplugin.git] / openflowplugin-impl / src / main / java / org / opendaylight / openflowplugin / impl / statistics / StatisticsContextImpl.java
diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/statistics/StatisticsContextImpl.java b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/statistics/StatisticsContextImpl.java
index b283c7ccc6337a2bd810575f634dd47adc931127..64d50ebb9439e52d92d83b4eec0fad99011f1800 100644 (file)
--- a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/statistics/StatisticsContextImpl.java
+++ b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/statistics/StatisticsContextImpl.java
@@ -9,7 +9,6 @@
 package org.opendaylight.openflowplugin.impl.statistics;
 
 import com.google.common.annotations.VisibleForTesting;
-import com.google.common.base.Optional;
 import com.google.common.base.Preconditions;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Iterators;
@@ -18,15 +17,6 @@ import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
 import com.google.common.util.concurrent.SettableFuture;
 import io.netty.util.Timeout;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import javax.annotation.CheckForNull;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-import javax.annotation.concurrent.GuardedBy;
 import org.opendaylight.openflowplugin.api.openflow.connection.ConnectionContext;
 import org.opendaylight.openflowplugin.api.openflow.device.DeviceContext;
 import org.opendaylight.openflowplugin.api.openflow.device.DeviceInfo;
@@ -44,6 +34,17 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev13
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import javax.annotation.CheckForNull;
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+import javax.annotation.concurrent.GuardedBy;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Optional;
+
 class StatisticsContextImpl implements StatisticsContext {
 
     private static final Logger LOG = LoggerFactory.getLogger(StatisticsContextImpl.class);
@@ -74,7 +75,6 @@ class StatisticsContextImpl implements StatisticsContext {
         statisticsGatheringOnTheFlyService = new StatisticsGatheringOnTheFlyService(this, deviceContext);
         itemLifeCycleListener = new ItemLifecycleListenerImpl(deviceContext);
         statListForCollectingInitialization();
-        this.deviceContext.setStatisticsContext(StatisticsContextImpl.this);
     }
 
     @Override
@@ -105,8 +105,18 @@ class StatisticsContextImpl implements StatisticsContext {
         }
     }
 
+
+    @Override
+    public ListenableFuture<Boolean> initialGatherDynamicData() {
+        return gatherDynamicData(true);
+    }
+
     @Override
-    public ListenableFuture<Boolean> gatherDynamicData() {
+    public ListenableFuture<Boolean> gatherDynamicData(){
+        return gatherDynamicData(false);
+    }
+
+    private ListenableFuture<Boolean> gatherDynamicData(final boolean initial) {
         if (shuttingDownStatisticsPolling) {
             LOG.debug("Statistics for device {} is not enabled.", deviceContext.getDeviceInfo().getNodeId());
             return Futures.immediateFuture(Boolean.TRUE);
@@ -122,7 +132,7 @@ class StatisticsContextImpl implements StatisticsContext {
             // write start timestamp to state snapshot container
             StatisticsGatheringUtils.markDeviceStateSnapshotStart(deviceContext);
 
-            statChainFuture(statIterator, settableStatResultFuture);
+            statChainFuture(statIterator, settableStatResultFuture, initial);
 
             // write end timestamp to state snapshot container
             Futures.addCallback(settableStatResultFuture, new FutureCallback<Boolean>() {
@@ -139,10 +149,10 @@ class StatisticsContextImpl implements StatisticsContext {
         }
     }
 
-    private ListenableFuture<Boolean> chooseStat(final MultipartType multipartType){
+    private ListenableFuture<Boolean> chooseStat(final MultipartType multipartType, final boolean initial){
         switch (multipartType) {
             case OFPMPFLOW:
-                return collectFlowStatistics(multipartType);
+                return collectFlowStatistics(multipartType, initial);
             case OFPMPTABLE:
                 return collectTableStatistics(multipartType);
             case OFPMPPORTSTATS:
@@ -205,10 +215,10 @@ class StatisticsContextImpl implements StatisticsContext {
 
     @Override
     public Optional<Timeout> getPollTimeout() {
-        return Optional.fromNullable(pollTimeout);
+        return Optional.ofNullable(pollTimeout);
     }
 
-    private void statChainFuture(final Iterator<MultipartType> iterator, final SettableFuture<Boolean> resultFuture) {
+    private void statChainFuture(final Iterator<MultipartType> iterator, final SettableFuture<Boolean> resultFuture, final boolean initial) {
         if (ConnectionContext.CONNECTION_STATE.RIP.equals(deviceContext.getPrimaryConnectionContext().getConnectionState())) {
             final String errMsg = String.format("Device connection is closed for Node : %s.",
                     deviceContext.getDeviceInfo().getNodeId());
@@ -225,11 +235,11 @@ class StatisticsContextImpl implements StatisticsContext {
         final MultipartType nextType = iterator.next();
         LOG.debug("Stats iterating to next type for node {} of type {}", deviceContext.getDeviceInfo().getNodeId(), nextType);
 
-        final ListenableFuture<Boolean> deviceStatisticsCollectionFuture = chooseStat(nextType);
+        final ListenableFuture<Boolean> deviceStatisticsCollectionFuture = chooseStat(nextType, initial);
         Futures.addCallback(deviceStatisticsCollectionFuture, new FutureCallback<Boolean>() {
             @Override
             public void onSuccess(final Boolean result) {
-                statChainFuture(iterator, resultFuture);
+                statChainFuture(iterator, resultFuture, initial);
             }
             @Override
             public void onFailure(@Nonnull final Throwable t) {
@@ -247,7 +257,7 @@ class StatisticsContextImpl implements StatisticsContext {
     @VisibleForTesting
     ListenableFuture<Boolean> deviceConnectionCheck() {
         if (!ConnectionContext.CONNECTION_STATE.WORKING.equals(deviceContext.getPrimaryConnectionContext().getConnectionState())) {
-            ListenableFuture<Boolean> resultingFuture = SettableFuture.create();
+            ListenableFuture<Boolean> resultingFuture;
             switch (deviceContext.getPrimaryConnectionContext().getConnectionState()) {
                 case RIP:
                     final String errMsg = String.format("Device connection doesn't exist anymore. Primary connection status : %s",
@@ -263,16 +273,15 @@ class StatisticsContextImpl implements StatisticsContext {
         return null;
     }
 
-    private ListenableFuture<Boolean> collectFlowStatistics(final MultipartType multipartType) {
+    //TODO: Refactor twice sending deviceContext into gatheringStatistics
+    private ListenableFuture<Boolean> collectFlowStatistics(final MultipartType multipartType, final boolean initial) {
         return devState.isFlowStatisticsAvailable() ? StatisticsGatheringUtils.gatherStatistics(
                 statisticsGatheringOnTheFlyService,
                 deviceContext.getDeviceInfo(),
                 /*MultipartType.OFPMPFLOW*/ multipartType,
                 deviceContext,
-                deviceContext.getDeviceFlowRegistry(),
-                deviceContext.getDeviceGroupRegistry(),
-                deviceContext.getDeviceMeterRegistry(),
-                devState) : emptyFuture;
+                deviceContext,
+                initial) : emptyFuture;
     }
 
     private ListenableFuture<Boolean> collectTableStatistics(final MultipartType multipartType) {
@@ -281,10 +290,8 @@ class StatisticsContextImpl implements StatisticsContext {
                 deviceContext.getDeviceInfo(),
                 /*MultipartType.OFPMPTABLE*/ multipartType,
                 deviceContext,
-                deviceContext.getDeviceFlowRegistry(),
-                deviceContext.getDeviceGroupRegistry(),
-                deviceContext.getDeviceMeterRegistry(),
-                devState) : emptyFuture;
+                deviceContext,
+                false) : emptyFuture;
     }
 
     private ListenableFuture<Boolean> collectPortStatistics(final MultipartType multipartType) {
@@ -293,10 +300,8 @@ class StatisticsContextImpl implements StatisticsContext {
                 deviceContext.getDeviceInfo(),
                 /*MultipartType.OFPMPPORTSTATS*/ multipartType,
                 deviceContext,
-                deviceContext.getDeviceFlowRegistry(),
-                deviceContext.getDeviceGroupRegistry(),
-                deviceContext.getDeviceMeterRegistry(),
-                devState) : emptyFuture;
+                deviceContext,
+                false) : emptyFuture;
     }
 
     private ListenableFuture<Boolean> collectQueueStatistics(final MultipartType multipartType) {
@@ -305,10 +310,8 @@ class StatisticsContextImpl implements StatisticsContext {
                 deviceContext.getDeviceInfo(),
                 /*MultipartType.OFPMPQUEUE*/ multipartType,
                 deviceContext,
-                deviceContext.getDeviceFlowRegistry(),
-                deviceContext.getDeviceGroupRegistry(),
-                deviceContext.getDeviceMeterRegistry(),
-                devState);
+                deviceContext,
+                false);
     }
 
     private ListenableFuture<Boolean> collectGroupDescStatistics(final MultipartType multipartType) {
@@ -317,10 +320,8 @@ class StatisticsContextImpl implements StatisticsContext {
                 deviceContext.getDeviceInfo(),
                 /*MultipartType.OFPMPGROUPDESC*/ multipartType,
                 deviceContext,
-                deviceContext.getDeviceFlowRegistry(),
-                deviceContext.getDeviceGroupRegistry(),
-                deviceContext.getDeviceMeterRegistry(),
-                devState) : emptyFuture;
+                deviceContext,
+                false) : emptyFuture;
     }
 
     private ListenableFuture<Boolean> collectGroupStatistics(final MultipartType multipartType) {
@@ -329,10 +330,8 @@ class StatisticsContextImpl implements StatisticsContext {
                 deviceContext.getDeviceInfo(),
                 /*MultipartType.OFPMPGROUP*/ multipartType,
                 deviceContext,
-                deviceContext.getDeviceFlowRegistry(),
-                deviceContext.getDeviceGroupRegistry(),
-                deviceContext.getDeviceMeterRegistry(),
-                devState) : emptyFuture;
+                deviceContext,
+                false) : emptyFuture;
     }
 
     private ListenableFuture<Boolean> collectMeterConfigStatistics(final MultipartType multipartType) {
@@ -341,10 +340,8 @@ class StatisticsContextImpl implements StatisticsContext {
                 deviceContext.getDeviceInfo(),
                 /*MultipartType.OFPMPMETERCONFIG*/ multipartType,
                 deviceContext,
-                deviceContext.getDeviceFlowRegistry(),
-                deviceContext.getDeviceGroupRegistry(),
-                deviceContext.getDeviceMeterRegistry(),
-                devState) : emptyFuture;
+                deviceContext,
+                false) : emptyFuture;
     }
 
     private ListenableFuture<Boolean> collectMeterStatistics(final MultipartType multipartType) {
@@ -353,10 +350,8 @@ class StatisticsContextImpl implements StatisticsContext {
                 deviceContext.getDeviceInfo(),
                 /*MultipartType.OFPMPMETER*/ multipartType,
                 deviceContext,
-                deviceContext.getDeviceFlowRegistry(),
-                deviceContext.getDeviceGroupRegistry(),
-                deviceContext.getDeviceMeterRegistry(),
-                devState) : emptyFuture;
+                deviceContext,
+                false) : emptyFuture;
     }
 
     @VisibleForTesting
@@ -375,9 +370,4 @@ class StatisticsContextImpl implements StatisticsContext {
         return itemLifeCycleListener;
     }
 
-
-    @Override
-    public DeviceContext getDeviceContext() {
-        return deviceContext;
-    }
 }
OpenFlow Plugin