Bug 2951 - ipv6 addresses containing zeros in input flow should be handled in operati...

[openflowplugin.git] / applications / statistics-manager / src / main / java / org / opendaylight / openflowplugin / applications / statistics / manager / impl / StatAbstractNotifyCommit.java

diff --git a/applications/statistics-manager/src/main/java/org/opendaylight/openflowplugin/applications/statistics/manager/impl/StatAbstractNotifyCommit.java b/applications/statistics-manager/src/main/java/org/opendaylight/openflowplugin/applications/statistics/manager/impl/StatAbstractNotifyCommit.java
index 22099167a40b8768ba9263c238522ef57d21a3fc..dcb64734cf30ea70b2d9066f7da572cda44df96e 100644 (file)
--- a/applications/statistics-manager/src/main/java/org/opendaylight/openflowplugin/applications/statistics/manager/impl/StatAbstractNotifyCommit.java
+++ b/applications/statistics-manager/src/main/java/org/opendaylight/openflowplugin/applications/statistics/manager/impl/StatAbstractNotifyCommit.java
@@ -13,10 +13,11 @@ import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 
 import org.opendaylight.controller.sal.binding.api.NotificationProviderService;
+import org.opendaylight.openflowplugin.applications.statistics.manager.StatNodeRegistration;
 import org.opendaylight.openflowplugin.applications.statistics.manager.StatNotifyCommiter;
-import org.opendaylight.openflowplugin.applications.statistics.manager.StatisticsManager;
 import org.opendaylight.openflowplugin.applications.statistics.manager.StatRpcMsgManager.TransactionCacheContainer;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.transaction.rev131103.TransactionId;
+import org.opendaylight.openflowplugin.applications.statistics.manager.StatisticsManager;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.transaction.rev150304.TransactionId;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.NodeId;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.Node;
 import org.opendaylight.yangtools.concepts.ListenerRegistration;
@@ -46,12 +47,16 @@ public abstract class StatAbstractNotifyCommit<N extends NotificationListener> i
 
     protected final StatisticsManager manager;
     private ListenerRegistration<NotificationListener> notifyListenerRegistration;
+    protected final StatNodeRegistration nodeRegistrationManager;
+
 
     public StatAbstractNotifyCommit(final StatisticsManager manager,
-            final NotificationProviderService nps) {
+            final NotificationProviderService nps,
+                                    final StatNodeRegistration nodeRegistrationManager) {
         Preconditions.checkArgument(nps != null, "NotificationProviderService can not be null!");
         this.manager = Preconditions.checkNotNull(manager, "StatisticManager can not be null!");
         notifyListenerRegistration = nps.registerNotificationListener(getStatNotificationListener());
+        this.nodeRegistrationManager = nodeRegistrationManager;
     }
 
     @Override
@@ -77,10 +82,10 @@ public abstract class StatAbstractNotifyCommit<N extends NotificationListener> i
     protected abstract N getStatNotificationListener();
 
     /**
-     * PreConfigurationCheck - Node identified by input InstanceIdentifier<Node>
+     * PreConfigurationCheck - Node identified by input InstanceIdentifier&lt;Node&gt;
      * has to be registered in {@link org.opendaylight.openflowplugin.applications.statistics.manager.StatPermCollector}
      *
-     * @param InstanceIdentifier<Node> nodeIdent
+     * @param nodeIdent
      */
     protected boolean preConfigurationCheck(final InstanceIdentifier<Node> nodeIdent) {
         Preconditions.checkNotNull(nodeIdent, "FlowCapableNode ident can not be null!");
@@ -97,8 +102,8 @@ public abstract class StatAbstractNotifyCommit<N extends NotificationListener> i
      * getTransactionCacheContainer with 10sec TimeOut.
      * Method has returned {@link Optional} which could contains a {@link TransactionCacheContainer}
      *
-     * @param TransactionId transId
-     * @param NodeId nodeId
+     * @param transId
+     * @param nodeId
      * @return
      */
     protected Optional<TransactionCacheContainer<?>> getTransactionCacheContainer(final TransactionId transId, final NodeId nodeId) {
@@ -141,8 +146,8 @@ public abstract class StatAbstractNotifyCommit<N extends NotificationListener> i
      * isExpectedStatistics with 10sec TimeOut.
      * Method has checked registration for provided {@link TransactionId} and {@link NodeId}
      *
-     * @param TransactionId transId - Transaction identification
-     * @param NodeId nodeId - Node identification
+     * @param transId - Transaction identification
+     * @param nodeId - Node identification
      * @return boolean
      */
     protected boolean isExpectedStatistics(final TransactionId transId, final NodeId nodeId) {