| 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] [blame] |
Merged master fixed conflict. Change-Id: I1260048f4cc90c422ce6033d506c25ec38d6cc3a
diff --git a/core/net/src/main/java/org/onosproject/net/flow/impl/FlowRuleManager.java b/core/net/src/main/java/org/onosproject/net/flow/impl/FlowRuleManager.java index 6e0adbc..e5220b5 100644 --- a/core/net/src/main/java/org/onosproject/net/flow/impl/FlowRuleManager.java +++ b/core/net/src/main/java/org/onosproject/net/flow/impl/FlowRuleManager.java
@@ -244,6 +244,12 @@ } @Override + public void purgeFlowRules(DeviceId deviceId) { + checkPermission(FLOWRULE_WRITE); + store.purgeFlowRule(deviceId); + } + + @Override public void removeFlowRules(FlowRule... flowRules) { checkPermission(FLOWRULE_WRITE);