commit ea89a1c27bc48a7ad6d224eca876f9f92acd75bd
author Charles Chan <rascov@gmail.com> Mon Aug 13 13:14:18 2018 -0700
committer Charles Chan <charles@opennetworking.org> Tue Aug 14 06:02:07 2018 +0000
tree 4c7ffaae25ae85d226acdf80a5768d7391c45a68
parent 07a367b71157f881a4b146d6b068b3dc3789dc5a

NextId should be int instead of byte

Change-Id: I58b1dc7181eadc83dc6782756e631c241f62b15b

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 c4ecdfd..bdc6d5e 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
@@ -19,7 +19,6 @@
 import com.google.common.collect.ImmutableSet;
 import org.onlab.packet.MacAddress;
 import org.onlab.packet.VlanId;
-import org.onlab.util.ImmutableByteSequence;
 import org.onosproject.net.DeviceId;
 import org.onosproject.net.flow.DefaultFlowRule;
 import org.onosproject.net.flow.DefaultTrafficSelector;
@@ -255,8 +254,7 @@
 
         treatment = fwd.treatment();
         if (fwd.nextId() != null) {
-            PiActionParam nextIdParam = new PiActionParam(FabricConstants.NEXT_ID,
-                                                          ImmutableByteSequence.copyFrom(fwd.nextId().byteValue()));
+            PiActionParam nextIdParam = new PiActionParam(FabricConstants.NEXT_ID, fwd.nextId());
             PiAction nextIdAction = PiAction.builder()
                     .withId(FabricConstants.FABRIC_INGRESS_FORWARDING_POP_MPLS_AND_NEXT)
                     .withParameter(nextIdParam)
@@ -291,8 +289,7 @@
      * @return treatment with set_next_id action; empty treatment if next id is null
      */
     private static TrafficTreatment buildSetNextIdTreatment(Integer nextId, PiActionId actionId) {
-        PiActionParam nextIdParam = new PiActionParam(FabricConstants.NEXT_ID,
-                                                      ImmutableByteSequence.copyFrom(nextId.byteValue()));
+        PiActionParam nextIdParam = new PiActionParam(FabricConstants.NEXT_ID, nextId);
         PiAction nextIdAction = PiAction.builder()
                 .withId(actionId)
                 .withParameter(nextIdParam)