commit 079d57cbb0d7fd5eb344aa21fae043c68d4e290c
author Toshio Koide <t-koide@onlab.us> Thu Aug 21 18:03:58 2014 -0700
committer Saurav Das <sauravdas@alumni.stanford.edu> Fri Sep 05 11:47:22 2014 -0700
tree 6c5f5b49623ea711804ee2dfbd143e7c5320bdad
parent 846488236a91e41f0b1b5ef62831937c3d2be78f

Add a method for retrieving FlowIdGenerator instance to FlowManagerService.

Change-Id: I65c28c36994f2f1c37e1383977ec6a819225584a

src/main/java/net/onrc/onos/core/flowmanager/FlowManagerModule.java

diff --git a/src/main/java/net/onrc/onos/core/flowmanager/FlowManagerModule.java b/src/main/java/net/onrc/onos/core/flowmanager/FlowManagerModule.java
index c9263b2..86a3320 100644
--- a/src/main/java/net/onrc/onos/core/flowmanager/FlowManagerModule.java
+++ b/src/main/java/net/onrc/onos/core/flowmanager/FlowManagerModule.java
@@ -14,6 +14,7 @@
 import net.onrc.onos.api.flowmanager.FlowBatchOperation;
 import net.onrc.onos.api.flowmanager.FlowBatchOperation.Operator;
 import net.onrc.onos.api.flowmanager.FlowId;
+import net.onrc.onos.api.flowmanager.FlowIdGenerator;
 import net.onrc.onos.api.flowmanager.FlowManagerListener;
 import net.onrc.onos.api.flowmanager.FlowManagerService;
 import net.onrc.onos.core.matchaction.MatchActionIdGeneratorWithIdBlockAllocator;
@@ -31,19 +32,24 @@
 public class FlowManagerModule implements FlowManagerService {
     private ConflictDetectionPolicy conflictDetectionPolicy;
     private FlowOperationMap flowOperationMap;
-    private MatchActionIdGeneratorWithIdBlockAllocator maIdAllocator;
-    private MatchActionOperationsIdGeneratorWithIdBlockAllocator maoIdAllocator;
+    private MatchActionIdGeneratorWithIdBlockAllocator maIdGenerator;
+    private MatchActionOperationsIdGeneratorWithIdBlockAllocator maoIdGenerator;
+    private FlowIdGeneratorWithIdBlockAllocator flowIdGenerator;
 
     /**
      * Constructs FlowManagerModule with {@link IdBlockAllocator}.
      */
     public FlowManagerModule(IdBlockAllocator idBlockAllocator) {
-        this.maIdAllocator =
-                new MatchActionIdGeneratorWithIdBlockAllocator(idBlockAllocator);
-        this.maoIdAllocator =
-                new MatchActionOperationsIdGeneratorWithIdBlockAllocator(idBlockAllocator);
+        this.flowIdGenerator =
+                new FlowIdGeneratorWithIdBlockAllocator(idBlockAllocator);
         this.conflictDetectionPolicy = ConflictDetectionPolicy.FREE;
         this.flowOperationMap = new FlowOperationMap();
+
+        // TODO: MatchActionOperationsIdGenerator should be retrieved from MatchAction Module.
+        this.maIdGenerator =
+                new MatchActionIdGeneratorWithIdBlockAllocator(idBlockAllocator);
+        this.maoIdGenerator =
+                new MatchActionOperationsIdGeneratorWithIdBlockAllocator(idBlockAllocator);
     }
 
     @Override
@@ -92,6 +98,11 @@
     }
 
     @Override
+    public FlowIdGenerator getFlowIdGenerator() {
+        return flowIdGenerator;
+    }
+
+    @Override
     public void setConflictDetectionPolicy(ConflictDetectionPolicy policy) {
         if (policy == ConflictDetectionPolicy.FREE) {
             conflictDetectionPolicy = policy;
@@ -119,7 +130,7 @@
     }
 
     private MatchActionOperations createNewMatchActionOperations() {
-        return new MatchActionOperations(maoIdAllocator.getNewId());
+        return new MatchActionOperations(maoIdGenerator.getNewId());
     }
 
     /**
@@ -150,7 +161,7 @@
 
             Flow flow = (Flow) e.getTarget();
             List<MatchActionOperations> maOps = flow.compile(
-                    e.getOperator(), maIdAllocator, maoIdAllocator);
+                    e.getOperator(), maIdGenerator, maoIdGenerator);
             checkNotNull(maOps, "Could not compile the flow: " + flow);
             checkState(maOps.size() == 2,
                     "The flow generates unspported match-action operations.");