[AETHER-514] Support MODIFY on SIMPLE next
Add additional debug prints and removes the generation
of the hashed and next_vlan flows
Change-Id: Iecee9e86dd8443ae0b67c5fad193311f929503a2
diff --git a/pipelines/fabric/impl/src/main/java/org/onosproject/pipelines/fabric/impl/behaviour/pipeliner/NextObjectiveTranslator.java b/pipelines/fabric/impl/src/main/java/org/onosproject/pipelines/fabric/impl/behaviour/pipeliner/NextObjectiveTranslator.java
index cb79e9b..1e0e52d 100644
--- a/pipelines/fabric/impl/src/main/java/org/onosproject/pipelines/fabric/impl/behaviour/pipeliner/NextObjectiveTranslator.java
+++ b/pipelines/fabric/impl/src/main/java/org/onosproject/pipelines/fabric/impl/behaviour/pipeliner/NextObjectiveTranslator.java
@@ -199,7 +199,7 @@
obj.nextTreatments(), true);
if (forceSimple && treatments.size() > 1) {
- log.warn("Forcing SIMPLE behavior for NextObjective with {} treatments []",
+ log.warn("Forcing SIMPLE behavior for NextObjective with {} treatments {}",
treatments.size(), obj);
}
@@ -494,10 +494,12 @@
}
private boolean isGroupModifyOp(NextObjective obj) {
- // If operation is ADD_TO_EXIST or REMOVE_FROM_EXIST, it means we modify
+ // If operation is ADD_TO_EXIST, REMOVE_FROM_EXIST or MODIFY, it means we modify
// group buckets only, no changes for flow rules.
+ // FIXME Please note that for MODIFY op this could not apply in future if we extend the scope of MODIFY
return obj.op() == Objective.Operation.ADD_TO_EXISTING ||
- obj.op() == Objective.Operation.REMOVE_FROM_EXISTING;
+ obj.op() == Objective.Operation.REMOVE_FROM_EXISTING ||
+ obj.op() == Objective.Operation.MODIFY;
}
private boolean isXconnect(NextObjective obj) {