commit a272a9fd108a6c5faf3da9aef4d49e983232fd93
author Phaneendra Manda <phaneendra.manda@huawei.com> Fri Dec 04 02:42:55 2015 +0530
committer Gerrit Code Review <gerrit@onlab.us> Wed Dec 09 18:00:34 2015 +0000
tree 4566eb3d4062a61e3b0f5f9d39916d0e257a4e42
parent ffce9cf4a0f6eff0a9c0a00a53e57e88ec9b549f

[ONOS-3284]Types added Spi, SI and context header

Change-Id: Ib29d90d401c390d4ff5ac06e17507f2ffbb70f12

drivers/src/main/java/org/onosproject/driver/extensions/NiciraSetNshSi.java

diff --git a/drivers/src/main/java/org/onosproject/driver/extensions/NiciraSetNshSi.java b/drivers/src/main/java/org/onosproject/driver/extensions/NiciraSetNshSi.java
index 1480508..dec66c9 100644
--- a/drivers/src/main/java/org/onosproject/driver/extensions/NiciraSetNshSi.java
+++ b/drivers/src/main/java/org/onosproject/driver/extensions/NiciraSetNshSi.java
@@ -16,13 +16,15 @@
 
 package org.onosproject.driver.extensions;
 
-import com.google.common.base.MoreObjects;
+import java.util.Objects;
+
 import org.onlab.util.KryoNamespace;
+import org.onosproject.net.NshServiceIndex;
 import org.onosproject.net.flow.AbstractExtension;
 import org.onosproject.net.flow.instructions.ExtensionTreatment;
 import org.onosproject.net.flow.instructions.ExtensionTreatmentType;
 
-import java.util.Objects;
+import com.google.common.base.MoreObjects;
 
 /**
  * Nicira set NSH SI extension instruction.
@@ -30,7 +32,7 @@
 public class NiciraSetNshSi extends AbstractExtension implements
         ExtensionTreatment {
 
-    private byte nshSi;
+    private NshServiceIndex nshSi;
 
     private final KryoNamespace appKryo = new KryoNamespace.Builder().build();
 
@@ -38,7 +40,7 @@
      * Creates a new set nsh si instruction.
      */
     NiciraSetNshSi() {
-        nshSi = 0;
+        nshSi = NshServiceIndex.of((short) 0);
     }
 
     /**
@@ -46,7 +48,7 @@
      *
      * @param nshSi nsh service index
      */
-    NiciraSetNshSi(byte nshSi) {
+    NiciraSetNshSi(NshServiceIndex nshSi) {
         this.nshSi = nshSi;
     }
 
@@ -55,7 +57,7 @@
      *
      * @return nsh service index
      */
-    public byte nshSi() {
+    public NshServiceIndex nshSi() {
         return nshSi;
     }
 
@@ -66,12 +68,12 @@
 
     @Override
     public void deserialize(byte[] data) {
-        nshSi = appKryo.deserialize(data);
+        nshSi = NshServiceIndex.of(appKryo.deserialize(data));
     }
 
     @Override
     public byte[] serialize() {
-        return appKryo.serialize(nshSi);
+        return appKryo.serialize(nshSi.serviceIndex());
     }
 
     @Override