commit fc5acc731cc20d5ce022271d54b176328250e2e5
author Toshio Koide <t-koide@onlab.us> Tue Aug 12 18:45:46 2014 -0700
committer Saurav Das <sauravdas@alumni.stanford.edu> Fri Sep 05 11:47:21 2014 -0700
tree d19431a213366b7c177157c83e57c575c7a57c88
parent b8cea26de90ab3fcaca7bdbfdb98eacf1d71082e

Update FlowManager's API design and define batch operation map's API.

- FlowManager returns FlowBatchHandle as a handler to the batch execution.
 -- addFlow(), removeFlow() and executeBatch() methods are executed asynchronously.
 -- Users can get the current state of the batch via the FlowBatchHandle.
- Defined FlowOperationMap's inital API designs.

This task is a part of ONOS-1687, ONOS-1842, and ONOS-1692.

Change-Id: Ic9e8ce3ab0378615d9d3016b7755ee6d15e1e47c

src/main/java/net/onrc/onos/api/flowmanager/FlowBatchHandle.java

diff --git a/src/main/java/net/onrc/onos/api/flowmanager/FlowBatchHandle.java b/src/main/java/net/onrc/onos/api/flowmanager/FlowBatchHandle.java
index 166a12f..351d9e9 100644
--- a/src/main/java/net/onrc/onos/api/flowmanager/FlowBatchHandle.java
+++ b/src/main/java/net/onrc/onos/api/flowmanager/FlowBatchHandle.java
@@ -1,9 +1,13 @@
 package net.onrc.onos.api.flowmanager;
 
+import net.onrc.onos.core.flowmanager.FlowOperationMap;
+
+
 /**
  * Handle class to handle flow batch operation.
  */
 public class FlowBatchHandle {
+    private final FlowOperationMap flowOperationMap;
     private final FlowBatchId batchId;
 
     /**
@@ -12,9 +16,12 @@
      * The ID is automatically generated and assigned by FlowManager, and used
      * as an internal key for the flow batch operation map.
      *
+     * @param opMap the FlowOperationMap object which maintains the flow batch
+     *        operation
      * @param id the batch operation ID
      */
-    public FlowBatchHandle(FlowBatchId id) {
+    public FlowBatchHandle(FlowOperationMap opMap, FlowBatchId id) {
+        flowOperationMap = opMap;
         batchId = id;
     }
 
@@ -26,4 +33,8 @@
     public FlowBatchId getBatchOperationId() {
         return batchId;
     }
+
+    public FlowBatchState getState() {
+        return flowOperationMap.getState(batchId);
+    }
 }

src/main/java/net/onrc/onos/api/flowmanager/FlowBatchState.java

diff --git a/src/main/java/net/onrc/onos/api/flowmanager/FlowBatchState.java b/src/main/java/net/onrc/onos/api/flowmanager/FlowBatchState.java
index fd62a97..9205476 100644
--- a/src/main/java/net/onrc/onos/api/flowmanager/FlowBatchState.java
+++ b/src/main/java/net/onrc/onos/api/flowmanager/FlowBatchState.java
@@ -1,5 +1,6 @@
 package net.onrc.onos.api.flowmanager;
 
+
 /**
  * Represents the state of {@link FlowBatchOperation}.
  */

src/main/java/net/onrc/onos/api/flowmanager/FlowManagerListener.java

diff --git a/src/main/java/net/onrc/onos/api/flowmanager/FlowManagerListener.java b/src/main/java/net/onrc/onos/api/flowmanager/FlowManagerListener.java
index 0e70867..90ed2ca 100644
--- a/src/main/java/net/onrc/onos/api/flowmanager/FlowManagerListener.java
+++ b/src/main/java/net/onrc/onos/api/flowmanager/FlowManagerListener.java
@@ -1,5 +1,6 @@
 package net.onrc.onos.api.flowmanager;
 
+
 /**
  * An interface to the FlowManager's listener.
  */

src/main/java/net/onrc/onos/api/flowmanager/FlowManagerService.java

diff --git a/src/main/java/net/onrc/onos/api/flowmanager/FlowManagerService.java b/src/main/java/net/onrc/onos/api/flowmanager/FlowManagerService.java
index 4812de2..347c5fa 100644
--- a/src/main/java/net/onrc/onos/api/flowmanager/FlowManagerService.java
+++ b/src/main/java/net/onrc/onos/api/flowmanager/FlowManagerService.java
@@ -15,20 +15,26 @@
  */
 public interface FlowManagerService {
     /**
-     * Adds Flow object, calculates match-action plan and executes it.
+     * Adds Flow object, calculates match-action plan and executes it
+     * asynchronously.
+     * <p>
+     * To track the execution result, use the returned FlowBatchHandle object.
      *
      * @param flow Flow object to be added
-     * @return true if succeeded, false otherwise
+     * @return FlowBatchHandle object if succeeded, null otherwise
      */
-    boolean addFlow(Flow flow);
+    FlowBatchHandle addFlow(Flow flow);
 
     /**
-     * Removes Flow object, calculates match-action plan and executes it.
+     * Removes Flow object, calculates match-action plan and executes it
+     * asynchronously.
+     * <p>
+     * To track the execution result, use the returned FlowBatchHandle object.
      *
      * @param id ID for Flow object to be removed
-     * @return true if succeeded, false otherwise
+     * @return FlowBatchHandle object if succeeded, null otherwise
      */
-    boolean removeFlow(FlowId id);
+    FlowBatchHandle removeFlow(FlowId id);
 
     /**
      * Gets Flow object.
@@ -46,12 +52,14 @@
     Collection<Flow> getFlows();
 
     /**
-     * Executes batch operation of Flow object.
+     * Executes batch operation of Flow object asynchronously.
+     * <p>
+     * To track the execution result, use the returned FlowBatchHandle object.
      *
      * @param ops flow operations to be executed
-     * @return true if succeeded, false otherwise
+     * @return FlowBatchHandle object if succeeded, null otherwise
      */
-    boolean executeBatch(FlowBatchOperation ops);
+    FlowBatchHandle executeBatch(FlowBatchOperation ops);
 
     /**
      * Sets a conflict detection policy.