commit bb42cad6c4a392a6435af0fab9d70c2faf97d90a
author alshabib <alshabibi.ali@gmail.com> Thu Sep 25 11:43:05 2014 -0700
committer alshabib <alshabibi.ali@gmail.com> Thu Sep 25 11:43:05 2014 -0700
tree 0e756cca4aabe3e525b13d07e54fad27649ec78b
parent 6823abc1d044b6ec5779a6b9454fb8083e1e8ea9

flowmanager tests

Change-Id: I27ff62e4483254e565153294eddc20b525f5db01

core/net/src/main/java/org/onlab/onos/net/flow/impl/FlowRuleManager.java

diff --git a/core/net/src/main/java/org/onlab/onos/net/flow/impl/FlowRuleManager.java b/core/net/src/main/java/org/onlab/onos/net/flow/impl/FlowRuleManager.java
index 337f437..8513a2e 100644
--- a/core/net/src/main/java/org/onlab/onos/net/flow/impl/FlowRuleManager.java
+++ b/core/net/src/main/java/org/onlab/onos/net/flow/impl/FlowRuleManager.java
@@ -1,6 +1,11 @@
 package org.onlab.onos.net.flow.impl;
 
-import com.google.common.collect.Lists;
+import static com.google.common.base.Preconditions.checkNotNull;
+import static org.slf4j.LoggerFactory.getLogger;
+
+import java.util.Iterator;
+import java.util.List;
+
 import org.apache.felix.scr.annotations.Activate;
 import org.apache.felix.scr.annotations.Component;
 import org.apache.felix.scr.annotations.Deactivate;
@@ -26,11 +31,7 @@
 import org.onlab.onos.net.provider.AbstractProviderService;
 import org.slf4j.Logger;
 
-import java.util.Iterator;
-import java.util.List;
-
-import static com.google.common.base.Preconditions.checkNotNull;
-import static org.slf4j.LoggerFactory.getLogger;
+import com.google.common.collect.Lists;
 
 /**
  * Provides implementation of the flow NB & SB APIs.
@@ -47,7 +48,7 @@
     private final AbstractListenerRegistry<FlowRuleEvent, FlowRuleListener>
     listenerRegistry = new AbstractListenerRegistry<>();
 
-    private FlowRuleStoreDelegate delegate = new InternalStoreDelegate();
+    private final FlowRuleStoreDelegate delegate = new InternalStoreDelegate();
 
     @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
     protected FlowRuleStore store;
@@ -107,6 +108,7 @@
         Iterable<FlowRule> rules =  getFlowRulesById(id);
         FlowRuleProvider frp;
         Device device;
+
         for (FlowRule f : rules) {
             store.deleteFlowRule(f);
             device = deviceService.getDevice(f.deviceId());
@@ -181,10 +183,11 @@
             checkValidity();
             Device device = deviceService.getDevice(flowRule.deviceId());
             FlowRuleProvider frp = getProvider(device.providerId());
+            FlowRuleEvent event = null;
             switch (flowRule.state()) {
             case PENDING_REMOVE:
             case REMOVED:
-                store.removeFlowRule(flowRule);
+                event = store.removeFlowRule(flowRule);
                 frp.removeFlowRule(flowRule);
                 break;
             case ADDED:
@@ -195,6 +198,10 @@
                 log.debug("Flow {} has not been installed.", flowRule);
             }
 
+            if (event != null) {
+                log.debug("Flow {} removed", flowRule);
+                post(event);
+            }
 
         }
 
@@ -245,7 +252,7 @@
                 }
             }
             for (FlowRule rule : storedRules) {
-
+                log.info("missing rule is {}", rule);
                 // there are rules in the store that aren't on the switch
                 flowMissing(rule);