commit d4e53e1689e46c26ef94598e581cdd56fb4f0307
author Ayaka Koshibe <ayaka@onlab.us> Thu Sep 18 14:24:55 2014 -0700
committer Ayaka Koshibe <ayaka@onlab.us> Thu Sep 18 14:24:55 2014 -0700
tree 3a22713927c87fe94a6c5a010a673e7027a2f0e7
parent 5a18e80287f83d429631bdc4d0a12927077e5df8

Consolidated FlowEntry into FlowRule

Change-Id: I349d73abba3336f4c79429efb5717e0a8c374a30

core/api/src/main/java/org/onlab/onos/net/flow/FlowRuleService.java

diff --git a/core/api/src/main/java/org/onlab/onos/net/flow/FlowRuleService.java b/core/api/src/main/java/org/onlab/onos/net/flow/FlowRuleService.java
index ba75ae9..d2b9432 100644
--- a/core/api/src/main/java/org/onlab/onos/net/flow/FlowRuleService.java
+++ b/core/api/src/main/java/org/onlab/onos/net/flow/FlowRuleService.java
@@ -21,7 +21,7 @@
      * @param deviceId device identifier
      * @return collection of flow rules
      */
-    Iterable<FlowEntry> getFlowEntries(DeviceId deviceId);
+    Iterable<FlowRule> getFlowEntries(DeviceId deviceId);
 
     // TODO: add createFlowRule factory method and execute operations method
 
@@ -34,7 +34,7 @@
      * throws SomeKindOfException that indicates which ones were applied and
      *                  which ones failed
      */
-    List<FlowEntry> applyFlowRules(FlowRule... flowRules);
+    List<FlowRule> applyFlowRules(FlowRule... flowRules);
 
     /**
      * Removes the specified flow rules from their respective devices. If the