4 files changed, 26 insertions, 24 deletions
diff --git a/framework/src/onos/core/api/src/main/java/org/onosproject/net/flow/instructions/AbstractExtensionInstruction.java b/framework/src/onos/core/api/src/main/java/org/onosproject/net/flow/instructions/AbstractExtensionTreatment.java
index 9f22f888..ac7c771f 100644
--- a/framework/src/onos/core/api/src/main/java/org/onosproject/net/flow/instructions/AbstractExtensionInstruction.java
+++ b/framework/src/onos/core/api/src/main/java/org/onosproject/net/flow/instructions/AbstractExtensionTreatment.java
@@ -23,7 +23,7 @@ import java.util.List;
 /**
  * Abstract implementation of the set/get property methods of ExtensionInstruction.
  */
-public abstract class AbstractExtensionInstruction implements ExtensionInstruction {
+public abstract class AbstractExtensionTreatment implements ExtensionTreatment {
 
     private static final String INVALID_KEY = "Invalid property key: ";
     private static final String INVALID_TYPE = "Given type does not match field type: ";
diff --git a/framework/src/onos/core/api/src/main/java/org/onosproject/net/flow/instructions/ExtensionInstruction.java b/framework/src/onos/core/api/src/main/java/org/onosproject/net/flow/instructions/ExtensionTreatment.java
index 89e0cc5e..0e8885ed 100644
--- a/framework/src/onos/core/api/src/main/java/org/onosproject/net/flow/instructions/ExtensionInstruction.java
+++ b/framework/src/onos/core/api/src/main/java/org/onosproject/net/flow/instructions/ExtensionTreatment.java
@@ -21,14 +21,14 @@ import java.util.List;
 /**
  * An extensible instruction type.
  */
-public interface ExtensionInstruction {
+public interface ExtensionTreatment {
 
     /**
      * Gets the type of the extension instruction.
      *
      * @return type
      */
-    ExtensionType type();
+    ExtensionTreatmentType type();
 
     /**
      * Sets a property on the extension instruction.
diff --git a/framework/src/onos/core/api/src/main/java/org/onosproject/net/flow/instructions/ExtensionType.java b/framework/src/onos/core/api/src/main/java/org/onosproject/net/flow/instructions/ExtensionTreatmentType.java
index 3e1cb75c..38fbc279 100644
--- a/framework/src/onos/core/api/src/main/java/org/onosproject/net/flow/instructions/ExtensionType.java
+++ b/framework/src/onos/core/api/src/main/java/org/onosproject/net/flow/instructions/ExtensionTreatmentType.java
@@ -25,25 +25,27 @@ import java.util.Objects;
  * Type of extension instructions.
  */
 @Beta
-public final class ExtensionType {
+public final class ExtensionTreatmentType {
 
     /**
      * A list of well-known named extension instruction type codes.
+     * These numbers have no impact on the actual OF type id.
      */
-    public enum ExtensionTypes {
+    public enum ExtensionTreatmentTypes {
         // TODO fix type numbers to include experimenter id
-        NICIRA_SET_TUNNEL_DST(31),
-        NICIRA_RESUBMIT(32);
+        NICIRA_SET_TUNNEL_DST(0),
+        NICIRA_RESUBMIT(1),
+        NICIRA_SET_NSH_SPI(32);
 
-        private ExtensionType type;
+        private ExtensionTreatmentType type;
 
         /**
          * Creates a new named extension instruction type.
          *
          * @param type type code
          */
-        ExtensionTypes(int type) {
-            this.type = new ExtensionType(type);
+        ExtensionTreatmentTypes(int type) {
+            this.type = new ExtensionTreatmentType(type);
         }
 
         /**
@@ -51,7 +53,7 @@ public final class ExtensionType {
          *
          * @return extension type object
          */
-        public ExtensionType type() {
+        public ExtensionTreatmentType type() {
             return type;
         }
     }
@@ -63,7 +65,7 @@ public final class ExtensionType {
      *
      * @param type type code
      */
-    public ExtensionType(int type) {
+    public ExtensionTreatmentType(int type) {
         this.type = type;
     }
 
@@ -77,8 +79,8 @@ public final class ExtensionType {
         if (this == obj) {
             return true;
         }
-        if (obj instanceof ExtensionType) {
-            final ExtensionType that = (ExtensionType) obj;
+        if (obj instanceof ExtensionTreatmentType) {
+            final ExtensionTreatmentType that = (ExtensionTreatmentType) obj;
             return this.type == that.type;
         }
         return false;
@@ -86,7 +88,7 @@ public final class ExtensionType {
 
     @Override
     public String toString() {
-        return MoreObjects.toStringHelper(ExtensionType.class)
+        return MoreObjects.toStringHelper(ExtensionTreatmentType.class)
                 .add("type", type)
                 .toString();
     }
diff --git a/framework/src/onos/core/api/src/main/java/org/onosproject/net/flow/instructions/Instructions.java b/framework/src/onos/core/api/src/main/java/org/onosproject/net/flow/instructions/Instructions.java
index 126e722e..4643b315 100644
--- a/framework/src/onos/core/api/src/main/java/org/onosproject/net/flow/instructions/Instructions.java
+++ b/framework/src/onos/core/api/src/main/java/org/onosproject/net/flow/instructions/Instructions.java
@@ -489,7 +489,7 @@ public final class Instructions {
      * @param deviceId device ID
      * @return extension instruction
      */
-    public static ExtensionInstructionWrapper extension(ExtensionInstruction extension,
+    public static ExtensionInstructionWrapper extension(ExtensionTreatment extension,
                                                         DeviceId deviceId) {
         checkNotNull(extension, "Extension instruction cannot be null");
         checkNotNull(deviceId, "Device ID cannot be null");
@@ -858,16 +858,16 @@ public final class Instructions {
      *  Extension instruction.
      */
     public static class ExtensionInstructionWrapper implements Instruction {
-        private final ExtensionInstruction extensionInstruction;
+        private final ExtensionTreatment extensionTreatment;
         private final DeviceId deviceId;
 
-        ExtensionInstructionWrapper(ExtensionInstruction extension, DeviceId deviceId) {
-            extensionInstruction = extension;
+        ExtensionInstructionWrapper(ExtensionTreatment extension, DeviceId deviceId) {
+            extensionTreatment = extension;
             this.deviceId = deviceId;
         }
 
-        public ExtensionInstruction extensionInstruction() {
-            return extensionInstruction;
+        public ExtensionTreatment extensionInstruction() {
+            return extensionTreatment;
         }
 
         public DeviceId deviceId() {
@@ -882,14 +882,14 @@ public final class Instructions {
         @Override
         public String toString() {
             return toStringHelper(type().toString())
-                    .add("extension", extensionInstruction)
+                    .add("extension", extensionTreatment)
                     .add("deviceId", deviceId)
                     .toString();
         }
 
         @Override
         public int hashCode() {
-            return Objects.hash(type().ordinal(), extensionInstruction, deviceId);
+            return Objects.hash(type().ordinal(), extensionTreatment, deviceId);
         }
 
         @Override
@@ -899,7 +899,7 @@ public final class Instructions {
             }
             if (obj instanceof ExtensionInstructionWrapper) {
                 ExtensionInstructionWrapper that = (ExtensionInstructionWrapper) obj;
-                return Objects.equals(extensionInstruction, that.extensionInstruction)
+                return Objects.equals(extensionTreatment, that.extensionTreatment)
                         && Objects.equals(deviceId, that.deviceId);
 
             }