ONOS-3023 Changing flowTable sets to map so that we can compare

stored vs. new rule when adding and removing

Change-Id: Ibd885023d550af3b2220056fbdf44ad8ec7fefda

@@ -15,6 +15,7 @@
  */
  */
 package org.onosproject.net.flow;
 package org.onosproject.net.flow;
 
 
+import com.google.common.annotations.Beta;
 import org.onosproject.core.ApplicationId;
 import org.onosproject.core.ApplicationId;
 import org.onosproject.core.DefaultGroupId;
 import org.onosproject.core.DefaultGroupId;
 import org.onosproject.core.GroupId;
 import org.onosproject.core.GroupId;
@@ -284,6 +285,11 @@ public class DefaultFlowRule implements FlowRule {
         return tableId;
         return tableId;
     }
     }
 
 
+    @Beta
+    public long created() {
+        return created;
+    }
+
     public static Builder builder() {
     public static Builder builder() {
         return new Builder();
         return new Builder();
     }
     }

@@ -220,6 +220,7 @@ public class SimpleFlowRuleStore
             for (StoredFlowEntry stored : entries) {
             for (StoredFlowEntry stored : entries) {
                 if (stored.equals(rule)) {
                 if (stored.equals(rule)) {
                     synchronized (stored) {
                     synchronized (stored) {
+                        //FIXME modification of "stored" flow entry outside of flow table
                         stored.setBytes(rule.bytes());
                         stored.setBytes(rule.bytes());
                         stored.setLife(rule.life());
                         stored.setLife(rule.life());
                         stored.setPackets(rule.packets());
                         stored.setPackets(rule.packets());

@@ -311,6 +311,7 @@ public class FlowRuleManager
                     } catch (UnsupportedOperationException e) {
                     } catch (UnsupportedOperationException e) {
                         log.warn(e.getMessage());
                         log.warn(e.getMessage());
                         if (flowRule instanceof DefaultFlowEntry) {
                         if (flowRule instanceof DefaultFlowEntry) {
+                            //FIXME modification of "stored" flow entry outside of store
                             ((DefaultFlowEntry) flowRule).setState(FlowEntry.FlowEntryState.FAILED);
                             ((DefaultFlowEntry) flowRule).setState(FlowEntry.FlowEntryState.FAILED);
                         }
                         }
                     }
                     }
@@ -323,10 +324,8 @@ public class FlowRuleManager
                 log.debug("Flow {} removed", flowRule);
                 log.debug("Flow {} removed", flowRule);
                 post(event);
                 post(event);
             }
             }
-
         }
         }
 
 
-
         private void extraneousFlow(FlowRule flowRule) {
         private void extraneousFlow(FlowRule flowRule) {
             checkNotNull(flowRule, FLOW_RULE_NULL);
             checkNotNull(flowRule, FLOW_RULE_NULL);
             checkValidity();
             checkValidity();
@@ -335,13 +334,11 @@ public class FlowRuleManager
             log.debug("Flow {} is on switch but not in store.", flowRule);
             log.debug("Flow {} is on switch but not in store.", flowRule);
         }
         }
 
 
-
         private void flowAdded(FlowEntry flowEntry) {
         private void flowAdded(FlowEntry flowEntry) {
             checkNotNull(flowEntry, FLOW_RULE_NULL);
             checkNotNull(flowEntry, FLOW_RULE_NULL);
             checkValidity();
             checkValidity();
 
 
             if (checkRuleLiveness(flowEntry, store.getFlowEntry(flowEntry))) {
             if (checkRuleLiveness(flowEntry, store.getFlowEntry(flowEntry))) {
-
                 FlowRuleEvent event = store.addOrUpdateFlowRule(flowEntry);
                 FlowRuleEvent event = store.addOrUpdateFlowRule(flowEntry);
                 if (event == null) {
                 if (event == null) {
                     log.debug("No flow store event generated.");
                     log.debug("No flow store event generated.");
@@ -353,7 +350,6 @@ public class FlowRuleManager
                 log.debug("Removing flow rules....");
                 log.debug("Removing flow rules....");
                 removeFlowRules(flowEntry);
                 removeFlowRules(flowEntry);
             }
             }
-
         }
         }
 
 
         private boolean checkRuleLiveness(FlowEntry swRule, FlowEntry storedRule) {
         private boolean checkRuleLiveness(FlowEntry swRule, FlowEntry storedRule) {

@@ -269,23 +269,19 @@ public class FlowRuleManagerTest {
 
 
     @Test
     @Test
     public void flowRemoved() {
     public void flowRemoved() {
-
         FlowRule f1 = addFlowRule(1);
         FlowRule f1 = addFlowRule(1);
         FlowRule f2 = addFlowRule(2);
         FlowRule f2 = addFlowRule(2);
         StoredFlowEntry fe1 = new DefaultFlowEntry(f1);
         StoredFlowEntry fe1 = new DefaultFlowEntry(f1);
         FlowEntry fe2 = new DefaultFlowEntry(f2);
         FlowEntry fe2 = new DefaultFlowEntry(f2);
 
 
-
         providerService.pushFlowMetrics(DID, ImmutableList.of(fe1, fe2));
         providerService.pushFlowMetrics(DID, ImmutableList.of(fe1, fe2));
         service.removeFlowRules(f1);
         service.removeFlowRules(f1);
 
 
+        //FIXME modification of "stored" flow entry outside of store
         fe1.setState(FlowEntryState.REMOVED);
         fe1.setState(FlowEntryState.REMOVED);
 
 
-
-
         providerService.flowRemoved(fe1);
         providerService.flowRemoved(fe1);
 
 
-
         validateEvents(RULE_ADD_REQUESTED, RULE_ADD_REQUESTED, RULE_ADDED,
         validateEvents(RULE_ADD_REQUESTED, RULE_ADD_REQUESTED, RULE_ADDED,
                 RULE_ADDED, RULE_REMOVE_REQUESTED, RULE_REMOVED);
                 RULE_ADDED, RULE_REMOVE_REQUESTED, RULE_REMOVED);
 
 
@@ -301,7 +297,6 @@ public class FlowRuleManagerTest {
 
 
         providerService.flowRemoved(fe3);
         providerService.flowRemoved(fe3);
         validateEvents();
         validateEvents();
-
     }
     }
 
 
     @Test
     @Test

@@ -416,6 +416,7 @@ public class NewAdaptiveFlowStatsCollector {
                                    + " AdaptiveStats collection thread for {}",
                                    + " AdaptiveStats collection thread for {}",
                            sw.getStringId());
                            sw.getStringId());
 
 
+                   //FIXME modification of "stored" flow entry outside of store
                    stored.setLastSeen();
                    stored.setLastSeen();
                    continue;
                    continue;
                } else if (fe.life() < stored.life()) {
                } else if (fe.life() < stored.life()) {
@@ -428,11 +429,13 @@ public class NewAdaptiveFlowStatsCollector {
                                ", new life=" + fe.life() + ", old life=" + stored.life() +
                                ", new life=" + fe.life() + ", old life=" + stored.life() +
                                ", new lastSeen=" + fe.lastSeen() + ", old lastSeen=" + stored.lastSeen());
                                ", new lastSeen=" + fe.lastSeen() + ", old lastSeen=" + stored.lastSeen());
                    // go next
                    // go next
+                   //FIXME modification of "stored" flow entry outside of store
                    stored.setLastSeen();
                    stored.setLastSeen();
                    continue;
                    continue;
                }
                }
 
 
                // update now
                // update now
+               //FIXME modification of "stored" flow entry outside of store
                stored.setLife(fe.life());
                stored.setLife(fe.life());
                stored.setPackets(fe.packets());
                stored.setPackets(fe.packets());
                stored.setBytes(fe.bytes());
                stored.setBytes(fe.bytes());