| commit | c69c66ae54b2e280591c989349a8221101c4ebc6 | [log] [tgz] |
|---|---|---|
| author | Kavitha Alagesan <kalagesa@partner.ciena.com> | Wed Jun 15 14:26:04 2016 +0530 |
| committer | Gerrit Code Review <gerrit@onlab.us> | Mon Aug 08 17:56:09 2016 +0000 |
| tree | 87f4f63a495da0afe04428c256e690591dff4c9c | |
| parent | 63eeac3ea8bacb800f888b68b01f21e0f771652c [diff] |
Merged master fixed conflict. Change-Id: I1260048f4cc90c422ce6033d506c25ec38d6cc3a
diff --git a/core/api/src/main/java/org/onosproject/net/flow/FlowRuleService.java b/core/api/src/main/java/org/onosproject/net/flow/FlowRuleService.java index 9b8ef81..52af84a 100644 --- a/core/api/src/main/java/org/onosproject/net/flow/FlowRuleService.java +++ b/core/api/src/main/java/org/onosproject/net/flow/FlowRuleService.java
@@ -61,6 +61,12 @@ void applyFlowRules(FlowRule... flowRules); /** + * Purges all the flow rules on the specified device. + * @param deviceId device identifier + */ + void purgeFlowRules(DeviceId deviceId); + + /** * Removes the specified flow rules from their respective devices. If the * device is not presently connected to the controller, these flow will * be removed once the device reconnects.
diff --git a/core/api/src/main/java/org/onosproject/net/group/GroupService.java b/core/api/src/main/java/org/onosproject/net/group/GroupService.java index d56518a..369cc37 100644 --- a/core/api/src/main/java/org/onosproject/net/group/GroupService.java +++ b/core/api/src/main/java/org/onosproject/net/group/GroupService.java
@@ -107,6 +107,12 @@ ApplicationId appId); /** + * Purges all the group entries on the specified device. + * @param deviceId device identifier + */ + void purgeGroupEntries(DeviceId deviceId); + + /** * Deletes a group associated to an application cookie. * GROUP_DELETED or GROUP_DELETE_FAILED notifications would be * provided along with cookie depending on the result of the
diff --git a/core/api/src/test/java/org/onosproject/net/flow/FlowRuleServiceAdapter.java b/core/api/src/test/java/org/onosproject/net/flow/FlowRuleServiceAdapter.java index a12308d..4335983 100644 --- a/core/api/src/test/java/org/onosproject/net/flow/FlowRuleServiceAdapter.java +++ b/core/api/src/test/java/org/onosproject/net/flow/FlowRuleServiceAdapter.java
@@ -38,6 +38,10 @@ } @Override + public void purgeFlowRules(DeviceId deviceId){ + } + + @Override public void removeFlowRules(FlowRule... flowRules) { }