commit 97099915005e2d2503ea2fe9ab9b690e0676b918
author Jonathan Hart <jono@onlab.us> Thu Nov 14 13:40:16 2013 -0800
committer Jonathan Hart <jono@onlab.us> Thu Nov 14 13:40:16 2013 -0800
tree b8d03825431e52b2d4072c54e63b08eb4c0d916a
parent 3edb1752fa553a004e4b851ca92e3ab98fdd227c

Use FlowManager's flow ID service rather thanhave Forwarding generate its own IDs

src/main/java/net/onrc/onos/ofcontroller/flowmanager/FlowManager.java

diff --git a/src/main/java/net/onrc/onos/ofcontroller/flowmanager/FlowManager.java b/src/main/java/net/onrc/onos/ofcontroller/flowmanager/FlowManager.java
index e239ae9..c8e10c6 100644
--- a/src/main/java/net/onrc/onos/ofcontroller/flowmanager/FlowManager.java
+++ b/src/main/java/net/onrc/onos/ofcontroller/flowmanager/FlowManager.java
@@ -473,6 +473,7 @@
      *
      * @return the next Flow Entry ID to use.
      */
+    @Override
     public synchronized long getNextFlowEntryId() {
 	//
 	// Generate the next Flow Entry ID.

src/main/java/net/onrc/onos/ofcontroller/flowmanager/IFlowService.java

diff --git a/src/main/java/net/onrc/onos/ofcontroller/flowmanager/IFlowService.java b/src/main/java/net/onrc/onos/ofcontroller/flowmanager/IFlowService.java
index 8d362d1..f39acb5 100644
--- a/src/main/java/net/onrc/onos/ofcontroller/flowmanager/IFlowService.java
+++ b/src/main/java/net/onrc/onos/ofcontroller/flowmanager/IFlowService.java
@@ -120,4 +120,12 @@
      * @return the network topology.
      */
     Topology getTopology();
+    
+    /**
+     * Get a globally unique flow ID from the flow service.
+     * NOTE: Not currently guaranteed to be globally unique.
+     * 
+     * @return unique flow ID
+     */
+    public long getNextFlowEntryId();
 }