[ONOS-3361] Add nicira extension of resubmit instruction to onos

	modified:   core/api/src/main/java/org/onosproject/net/flow/instructions/ExtensionType.java
	modified:   drivers/src/main/java/org/onosproject/driver/extensions/NiciraExtensionInterpreter.java
	new file:   drivers/src/main/java/org/onosproject/driver/extensions/NiciraResubmit.java

Change-Id: Ib0a4a7b6360dd1629d0d2f74ef0d56f2c2a91a20

@@ -32,7 +32,8 @@ public final class ExtensionType {
      */
      */
     public enum ExtensionTypes {
     public enum ExtensionTypes {
         // TODO fix type numbers to include experimenter id
         // TODO fix type numbers to include experimenter id
-        NICIRA_SET_TUNNEL_DST(31);
+        NICIRA_SET_TUNNEL_DST(31),
+        NICIRA_RESUBMIT(32);
 
 
         private ExtensionType type;
         private ExtensionType type;
 
 

@@ -41,7 +41,9 @@ public class NiciraExtensionInterpreter extends AbstractHandlerBehaviour
         if (extensionType.equals(ExtensionType.ExtensionTypes.NICIRA_SET_TUNNEL_DST)) {
         if (extensionType.equals(ExtensionType.ExtensionTypes.NICIRA_SET_TUNNEL_DST)) {
             return true;
             return true;
         }
         }
-
+        if (extensionType.equals(ExtensionType.ExtensionTypes.NICIRA_RESUBMIT)) {
+            return true;
+        }
         return false;
         return false;
     }
     }
 
 
@@ -53,6 +55,9 @@ public class NiciraExtensionInterpreter extends AbstractHandlerBehaviour
             return factory.actions().setField(factory.oxms().tunnelIpv4Dst(
             return factory.actions().setField(factory.oxms().tunnelIpv4Dst(
                     IPv4Address.of(tunnelDst.tunnelDst().toInt())));
                     IPv4Address.of(tunnelDst.tunnelDst().toInt())));
         }
         }
+        if (type.equals(ExtensionType.ExtensionTypes.NICIRA_RESUBMIT.type())) {
+          // TODO this will be implemented later
+        }
         return null;
         return null;
     }
     }
 
 
@@ -78,6 +83,9 @@ public class NiciraExtensionInterpreter extends AbstractHandlerBehaviour
         if (type.equals(ExtensionType.ExtensionTypes.NICIRA_SET_TUNNEL_DST.type())) {
         if (type.equals(ExtensionType.ExtensionTypes.NICIRA_SET_TUNNEL_DST.type())) {
             return new NiciraSetTunnelDst();
             return new NiciraSetTunnelDst();
         }
         }
+        if (type.equals(ExtensionType.ExtensionTypes.NICIRA_RESUBMIT.type())) {
+            return new NiciraResubmit();
+        }
         throw new UnsupportedOperationException(
         throw new UnsupportedOperationException(
                 "Driver does not support extension type " + type.toString());
                 "Driver does not support extension type " + type.toString());
     }
     }

+/*
+ * Copyright 2015 Open Networking Laboratory
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.onosproject.driver.extensions;
+
+import com.google.common.base.MoreObjects;
+import org.onlab.util.KryoNamespace;
+import org.onosproject.net.PortNumber;
+import org.onosproject.net.flow.instructions.AbstractExtensionInstruction;
+import org.onosproject.net.flow.instructions.ExtensionType;
+import org.onosproject.store.serializers.PortNumberSerializer;
+
+import java.util.Objects;
+
+import static com.google.common.base.Preconditions.checkNotNull;
+
+/**
+ * Nicira resubmit extension instruction.
+ */
+public class NiciraResubmit extends AbstractExtensionInstruction {
+
+    private PortNumber inPort;
+
+    private final KryoNamespace appKryo = new KryoNamespace.Builder()
+            .register(new PortNumberSerializer(), PortNumber.class)
+            .register(byte[].class)
+            .build();
+
+    /**
+     * Creates a new resubmit instruction.
+     */
+    NiciraResubmit() {
+        inPort = null;
+    }
+
+    /**
+     * Creates a new resubmit instruction with a particular inPort.
+     *
+     * @param inPort in port number
+     */
+    public NiciraResubmit(PortNumber inPort) {
+        checkNotNull(inPort);
+        this.inPort = inPort;
+    }
+
+    /**
+     * Gets the inPort.
+     *
+     * @return inPort
+     */
+    public PortNumber inPort() {
+        return inPort;
+    }
+
+    @Override
+    public ExtensionType type() {
+        return ExtensionType.ExtensionTypes.NICIRA_RESUBMIT.type();
+    }
+
+    @Override
+    public void deserialize(byte[] data) {
+        inPort = appKryo.deserialize(data);
+    }
+
+    @Override
+    public byte[] serialize() {
+        return appKryo.serialize(inPort);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(inPort);
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj) {
+            return true;
+        }
+        if (obj instanceof NiciraResubmit) {
+            NiciraResubmit that = (NiciraResubmit) obj;
+            return Objects.equals(inPort, that.inPort);
+
+        }
+        return false;
+    }
+
+    @Override
+    public String toString() {
+        return MoreObjects.toStringHelper(getClass())
+                .add("inPort", inPort)
+                .toString();
+    }
+}