| commit | 38fc71e4837f54b36de2dcdd4e3dc75881f145e8 | [log] [tgz] |
|---|---|---|
| author | Yi Tseng <a86487817@gmail.com> | Fri Feb 03 14:50:47 2017 -0800 |
| committer | Luca Prete <luca@onlab.us> | Mon Apr 24 22:13:52 2017 +0000 |
| tree | fc76d5371d14af95df9e37e465df804c24d0db42 | |
| parent | ded800179bfdaca3c50ff8d53a881a2bd379d560 [diff] [blame] |
[ONOS-6016] Enhance IntentInstaller for FlowObjective Note: Provide order of objective context (for remove only) Handling objective errors in intent installer Change-Id: I50bb9d7a17a0ae71d22ba035cd5bc80f485ec45a
diff --git a/core/net/src/main/java/org/onosproject/net/flowobjective/impl/FlowObjectiveManager.java b/core/net/src/main/java/org/onosproject/net/flowobjective/impl/FlowObjectiveManager.java index 44fc986..37bf9d2 100644 --- a/core/net/src/main/java/org/onosproject/net/flowobjective/impl/FlowObjectiveManager.java +++ b/core/net/src/main/java/org/onosproject/net/flowobjective/impl/FlowObjectiveManager.java
@@ -265,7 +265,8 @@ private boolean queueObjective(DeviceId deviceId, ForwardingObjective fwd) { if (fwd.nextId() == null || - flowObjectiveStore.getNextGroup(fwd.nextId()) != null) { + flowObjectiveStore.getNextGroup(fwd.nextId()) != null || + fwd.op() == Objective.Operation.REMOVE) { // fast path return false; }