commit 77ec998d611ad05d4d3547566ff1cd1479ef41e2
author Toshio Koide <t-koide@onlab.us> Wed Aug 27 16:57:43 2014 -0700
committer Saurav Das <sauravdas@alumni.stanford.edu> Fri Sep 05 11:47:24 2014 -0700
tree 635496ddc9e4ecb6dd70055c7ec015d6ecfc8b41
parent 7db3ce9131382eca2de11bdf241e14043b8d1eca

Preperation for the FloodlightModule implementaion of MatchActionModule.

- Marked MatchActionFloodlightService interface as IFloodlightService.
- MatchActionFloodlightService extends MatchActionService and IFloodlightService.
- Added methods for getting ID generators to MatchActionService.
- Updated to use the MatchActionService in FlowManagerModule.
- This task is a part of ONOS-1730.

Change-Id: I86726939a2af905c378af57a9337c49a2a2425d5

src/main/java/net/onrc/onos/core/matchaction/MatchActionFloodlightService.java

diff --git a/src/main/java/net/onrc/onos/core/matchaction/MatchActionFloodlightService.java b/src/main/java/net/onrc/onos/core/matchaction/MatchActionFloodlightService.java
new file mode 100644
index 0000000..73c9e87
--- /dev/null
+++ b/src/main/java/net/onrc/onos/core/matchaction/MatchActionFloodlightService.java
@@ -0,0 +1,10 @@
+package net.onrc.onos.core.matchaction;
+
+import net.floodlightcontroller.core.module.IFloodlightService;
+
+/**
+ * A match action service interface as {@link IFloodlightService} service.
+ */
+public interface MatchActionFloodlightService extends MatchActionService,
+        IFloodlightService {
+}

src/main/java/net/onrc/onos/core/matchaction/MatchActionModule.java

diff --git a/src/main/java/net/onrc/onos/core/matchaction/MatchActionModule.java b/src/main/java/net/onrc/onos/core/matchaction/MatchActionModule.java
index 9ed031c..78e528c 100644
--- a/src/main/java/net/onrc/onos/core/matchaction/MatchActionModule.java
+++ b/src/main/java/net/onrc/onos/core/matchaction/MatchActionModule.java
@@ -5,6 +5,7 @@
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
+
 import net.onrc.onos.api.flowmanager.ConflictDetectionPolicy;
 
 /**
@@ -12,7 +13,7 @@
  * <p>
  * TODO: Make all methods thread-safe
  */
-public class MatchActionModule implements MatchActionService {
+public class MatchActionModule implements MatchActionFloodlightService {
 
     private final HashSet<MatchAction> currentOperations = new HashSet<>();
 
@@ -55,6 +56,20 @@
     }
 
     @Override
+    public MatchActionIdGenerator getMatchActionIdGenerator() {
+        // TODO Auto-generated method stub
+        // use MatchActionIdGeneratorWithIdBlockAllocator.
+        return null;
+    }
+
+    @Override
+    public MatchActionOperationsIdGenerator getMatchActionOperationsIdGenerator() {
+        // TODO Auto-generated method stub
+        // use MatchActionOperationsIdGeneratorWithIdBlockAllocator.
+        return null;
+    }
+
+    @Override
     public void addEventListener(EventListener listener) {
         // TODO Auto-generated method stub
 

src/main/java/net/onrc/onos/core/matchaction/MatchActionService.java

diff --git a/src/main/java/net/onrc/onos/core/matchaction/MatchActionService.java b/src/main/java/net/onrc/onos/core/matchaction/MatchActionService.java
index a905e09..161ed91 100644
--- a/src/main/java/net/onrc/onos/core/matchaction/MatchActionService.java
+++ b/src/main/java/net/onrc/onos/core/matchaction/MatchActionService.java
@@ -47,6 +47,20 @@
     ConflictDetectionPolicy getConflictDetectionPolicy();
 
     /**
+     * Gets the ID generator for MatchActionId.
+     *
+     * @return the ID generator for MatchActionId
+     */
+    MatchActionIdGenerator getMatchActionIdGenerator();
+
+    /**
+     * Gets the ID generator for MatchActionOperationsId.
+     *
+     * @return the ID generator for MatchActionOperationsId
+     */
+    MatchActionOperationsIdGenerator getMatchActionOperationsIdGenerator();
+
+    /**
      * Adds event listener to this service.
      *
      * @param listener EventListener to be added.