[CORD-197] Properly handles a flow with empty instruction

Change-Id: Ia465fdc8df1dca7a46249cd4cd8d41faf8461c3a

@@ -234,6 +234,7 @@ public final class DefaultTrafficTreatment implements TrafficTreatment {
 
 
             switch (instruction.type()) {
             switch (instruction.type()) {
                 case DROP:
                 case DROP:
+                case NOACTION:
                 case OUTPUT:
                 case OUTPUT:
                 case GROUP:
                 case GROUP:
                 case L0MODIFICATION:
                 case L0MODIFICATION:
@@ -259,9 +260,23 @@ public final class DefaultTrafficTreatment implements TrafficTreatment {
             return this;
             return this;
         }
         }
 
 
+        /**
+         * Add a NOACTION when DROP instruction is explicitly specified.
+         *
+         * @return the traffic treatment builder
+         */
         @Override
         @Override
         public Builder drop() {
         public Builder drop() {
-            return add(Instructions.createDrop());
+            return add(Instructions.createNoAction());
+        }
+
+        /**
+         * Add a NOACTION when no instruction is specified.
+         *
+         * @return the traffic treatment builder
+         */
+        private Builder noAction() {
+            return add(Instructions.createNoAction());
         }
         }
 
 
         @Override
         @Override
@@ -459,14 +474,10 @@ public final class DefaultTrafficTreatment implements TrafficTreatment {
 
 
         @Override
         @Override
         public TrafficTreatment build() {
         public TrafficTreatment build() {
-            //Don't add DROP instruction by default when instruction
-            //set is empty. This will be handled in DefaultSingleTablePipeline
-            //driver.
-
-            //if (deferred.size() == 0 && immediate.size() == 0
-            //        && table == null && !clear) {
-            //    drop();
-            //}
+            if (deferred.size() == 0 && immediate.size() == 0
+                    && table == null && !clear) {
+                noAction();
+            }
             return new DefaultTrafficTreatment(deferred, immediate, table, clear, meta, meter);
             return new DefaultTrafficTreatment(deferred, immediate, table, clear, meta, meter);
         }
         }
 
 

@@ -27,9 +27,18 @@ public interface Instruction {
         /**
         /**
          * Signifies that the traffic should be dropped.
          * Signifies that the traffic should be dropped.
          */
          */
+        @Deprecated
         DROP,
         DROP,
 
 
         /**
         /**
+         * Signifies that the traffic requires no action.
+         *
+         * In OF10, the behavior of NOACTION is DROP.
+         * In OF13, the behavior depends on current Action Set.
+         */
+        NOACTION,
+
+        /**
          * Signifies that the traffic should be output to a port.
          * Signifies that the traffic should be output to a port.
          */
          */
         OUTPUT,
         OUTPUT,

@@ -68,11 +68,21 @@ public final class Instructions {
      *
      *
      * @return drop instruction
      * @return drop instruction
      */
      */
+    @Deprecated
     public static DropInstruction createDrop() {
     public static DropInstruction createDrop() {
         return new DropInstruction();
         return new DropInstruction();
     }
     }
 
 
     /**
     /**
+     * Creates a no action instruction.
+     *
+     * @return no action instruction
+     */
+    public static NoActionInstruction createNoAction() {
+        return new NoActionInstruction();
+    }
+
+    /**
      * Creates a group instruction.
      * Creates a group instruction.
      *
      *
      * @param groupId Group Id
      * @param groupId Group Id
@@ -450,6 +460,7 @@ public final class Instructions {
     /**
     /**
      *  Drop instruction.
      *  Drop instruction.
      */
      */
+    @Deprecated
     public static final class DropInstruction implements Instruction {
     public static final class DropInstruction implements Instruction {
 
 
         private DropInstruction() {}
         private DropInstruction() {}
@@ -482,6 +493,40 @@ public final class Instructions {
     }
     }
 
 
     /**
     /**
+     *  No Action instruction.
+     */
+    public static final class NoActionInstruction implements Instruction {
+
+        private NoActionInstruction() {}
+
+        @Override
+        public Type type() {
+            return Type.NOACTION;
+        }
+
+        @Override
+        public String toString() {
+            return toStringHelper(type().toString()).toString();
+        }
+
+        @Override
+        public int hashCode() {
+            return Objects.hash(type().ordinal());
+        }
+
+        @Override
+        public boolean equals(Object obj) {
+            if (this == obj) {
+                return true;
+            }
+            if (obj instanceof NoActionInstruction) {
+                return true;
+            }
+            return false;
+        }
+    }
+
+    /**
      *  Output Instruction.
      *  Output Instruction.
      */
      */
     public static final class OutputInstruction implements Instruction {
     public static final class OutputInstruction implements Instruction {

@@ -339,6 +339,7 @@ public final class KryoNamespaces {
                     Criterion.Type.class,
                     Criterion.Type.class,
                     DefaultTrafficTreatment.class,
                     DefaultTrafficTreatment.class,
                     Instructions.DropInstruction.class,
                     Instructions.DropInstruction.class,
+                    Instructions.NoActionInstruction.class,
                     Instructions.OutputInstruction.class,
                     Instructions.OutputInstruction.class,
                     Instructions.GroupInstruction.class,
                     Instructions.GroupInstruction.class,
                     Instructions.TableTypeTransition.class,
                     Instructions.TableTypeTransition.class,

@@ -221,11 +221,6 @@ public class FlowEntryBuilder {
 
 
     private TrafficTreatment buildTreatment() {
     private TrafficTreatment buildTreatment() {
         TrafficTreatment.Builder builder = DefaultTrafficTreatment.builder();
         TrafficTreatment.Builder builder = DefaultTrafficTreatment.builder();
-        // If this is a drop rule
-        if (instructions.size() == 0) {
-            builder.drop();
-            return builder.build();
-        }
         for (OFInstruction in : instructions) {
         for (OFInstruction in : instructions) {
             switch (in.getType()) {
             switch (in.getType()) {
                 case GOTO_TABLE:
                 case GOTO_TABLE:

@@ -142,7 +142,7 @@ public class FlowModBuilderVer10 extends FlowModBuilder {
         for (Instruction i : treatment.immediate()) {
         for (Instruction i : treatment.immediate()) {
             switch (i.type()) {
             switch (i.type()) {
             case DROP:
             case DROP:
-                log.warn("Saw drop action; assigning drop action");
+            case NOACTION:
                 return Collections.emptyList();
                 return Collections.emptyList();
             case L2MODIFICATION:
             case L2MODIFICATION:
                 act = buildL2Modification(i);
                 act = buildL2Modification(i);

@@ -215,6 +215,7 @@ public class FlowModBuilderVer13 extends FlowModBuilder {
         for (Instruction i : treatments) {
         for (Instruction i : treatments) {
             switch (i.type()) {
             switch (i.type()) {
                 case DROP:
                 case DROP:
+                case NOACTION:
                     return Collections.emptyList();
                     return Collections.emptyList();
                 case L0MODIFICATION:
                 case L0MODIFICATION:
                     actions.add(buildL0Modification(i));
                     actions.add(buildL0Modification(i));