commit 47eac89eb07a0195994a8b0e551894e192f69d20
author Yi Tseng <yi@opennetworking.org> Wed Jul 11 02:17:04 2018 +0800
committer Yi Tseng <yi@opennetworking.org> Thu Jul 12 23:47:10 2018 +0800
tree d76ae33e098c9ffa3cb83f11061db9a1e8c75643
parent 2a61ac2c7e53fd716d2d3560d8ec7e16a32505f5

Refactor fabric.p4

minor refactor for coding style

Change-Id: I7b73b9c3f439c66ce435404cb42fdb38323845b3

pipelines/fabric/src/main/java/org/onosproject/pipelines/fabric/pipeliner/FabricForwardingPipeliner.java

diff --git a/pipelines/fabric/src/main/java/org/onosproject/pipelines/fabric/pipeliner/FabricForwardingPipeliner.java b/pipelines/fabric/src/main/java/org/onosproject/pipelines/fabric/pipeliner/FabricForwardingPipeliner.java
index 785870e..c4ecdfd 100644
--- a/pipelines/fabric/src/main/java/org/onosproject/pipelines/fabric/pipeliner/FabricForwardingPipeliner.java
+++ b/pipelines/fabric/src/main/java/org/onosproject/pipelines/fabric/pipeliner/FabricForwardingPipeliner.java
@@ -34,6 +34,7 @@
 import org.onosproject.net.flow.criteria.VlanIdCriterion;
 import org.onosproject.net.flowobjective.ForwardingObjective;
 import org.onosproject.net.flowobjective.ObjectiveError;
+import org.onosproject.net.pi.model.PiActionId;
 import org.onosproject.net.pi.runtime.PiAction;
 import org.onosproject.net.pi.runtime.PiActionParam;
 import org.onosproject.pipelines.fabric.FabricConstants;
@@ -178,7 +179,8 @@
                 .build();
         TrafficTreatment treatment = fwd.treatment();
         if (fwd.nextId() != null) {
-            treatment = buildSetNextIdTreatment(fwd.nextId());
+            treatment = buildSetNextIdTreatment(fwd.nextId(),
+                                                FabricConstants.FABRIC_INGRESS_FORWARDING_SET_NEXT_ID_BRIDGING);
         }
 
         FlowRule flowRule = DefaultFlowRule.builder()
@@ -206,7 +208,8 @@
                 .build();
         TrafficTreatment treatment = fwd.treatment();
         if (fwd.nextId() != null) {
-            treatment = buildSetNextIdTreatment(fwd.nextId());
+            treatment = buildSetNextIdTreatment(fwd.nextId(),
+                                                FabricConstants.FABRIC_INGRESS_FORWARDING_SET_NEXT_ID_BRIDGING);
         }
         FlowRule flowRule = DefaultFlowRule.builder()
                 .withSelector(selector)
@@ -229,7 +232,8 @@
                 .build();
         TrafficTreatment treatment = fwd.treatment();
         if (fwd.nextId() != null) {
-            treatment = buildSetNextIdTreatment(fwd.nextId());
+            treatment = buildSetNextIdTreatment(fwd.nextId(),
+                                                FabricConstants.FABRIC_INGRESS_FORWARDING_SET_NEXT_ID_UNICAST_V4);
         }
         FlowRule flowRule = DefaultFlowRule.builder()
                 .withSelector(selector)
@@ -286,11 +290,11 @@
      * @param nextId the next id for action
      * @return treatment with set_next_id action; empty treatment if next id is null
      */
-    private static TrafficTreatment buildSetNextIdTreatment(Integer nextId) {
+    private static TrafficTreatment buildSetNextIdTreatment(Integer nextId, PiActionId actionId) {
         PiActionParam nextIdParam = new PiActionParam(FabricConstants.NEXT_ID,
                                                       ImmutableByteSequence.copyFrom(nextId.byteValue()));
         PiAction nextIdAction = PiAction.builder()
-                .withId(FabricConstants.FABRIC_INGRESS_FORWARDING_SET_NEXT_ID)
+                .withId(actionId)
                 .withParameter(nextIdParam)
                 .build();