Remove Instruction.DROP deprecated in Emu

Change-Id: Ida5a5f489815dd1e972f6bfc8646e1e1bf0e8edd

@@ -275,9 +275,7 @@ public class GetFlowStatistics extends AbstractShellCommand {
     private Instruction.Type getInstructionType(String instType) {
     private Instruction.Type getInstructionType(String instType) {
         String instTypeUC = instType.toUpperCase();
         String instTypeUC = instType.toUpperCase();
 
 
-        if (instTypeUC.equals("DROP")) {
-            return Instruction.Type.DROP;
-        } else if (instTypeUC.equals("OUTPUT")) {
+        if (instTypeUC.equals("OUTPUT")) {
             return Instruction.Type.OUTPUT;
             return Instruction.Type.OUTPUT;
         } else if (instTypeUC.equals("GROUP")) {
         } else if (instTypeUC.equals("GROUP")) {
             return Instruction.Type.GROUP;
             return Instruction.Type.GROUP;

@@ -235,7 +235,6 @@ public final class DefaultTrafficTreatment implements TrafficTreatment {
         public Builder add(Instruction instruction) {
         public Builder add(Instruction instruction) {
 
 
             switch (instruction.type()) {
             switch (instruction.type()) {
-                case DROP:
                 case NOACTION:
                 case NOACTION:
                 case OUTPUT:
                 case OUTPUT:
                 case GROUP:
                 case GROUP:

@@ -25,13 +25,6 @@ public interface Instruction {
      */
      */
     enum Type {
     enum Type {
         /**
         /**
-         * Signifies that the traffic should be dropped.
-         * @deprecated 1.4.0 Emu Release
-         */
-        @Deprecated
-        DROP,
-
-        /**
          * Signifies that the traffic requires no action.
          * Signifies that the traffic requires no action.
          *
          *
          * In OF10, the behavior of NOACTION is DROP.
          * In OF10, the behavior of NOACTION is DROP.

@@ -251,7 +251,6 @@ public final class EncodeInstructionCodecHelper {
                 result.put(InstructionCodec.PORT, outputInstruction.port().toString());
                 result.put(InstructionCodec.PORT, outputInstruction.port().toString());
                 break;
                 break;
 
 
-            case DROP:
             case NOACTION:
             case NOACTION:
                 break;
                 break;
 
 

@@ -168,9 +168,6 @@ public class SimpleStatisticStore implements StatisticStore {
                 Instructions.OutputInstruction out = (Instructions.OutputInstruction) i;
                 Instructions.OutputInstruction out = (Instructions.OutputInstruction) i;
                 return out.port();
                 return out.port();
             }
             }
-            if (i.type() == Instruction.Type.DROP) {
-                return PortNumber.P0;
-            }
         }
         }
         return null;
         return null;
     }
     }

@@ -170,8 +170,6 @@ public final class FlowObjectiveCompositionUtil {
 
 
         for (Instruction instruction : trafficTreatment.allInstructions()) {
         for (Instruction instruction : trafficTreatment.allInstructions()) {
             switch (instruction.type()) {
             switch (instruction.type()) {
-                case DROP:
-                    return null;
                 case OUTPUT:
                 case OUTPUT:
                     break;
                     break;
                 case GROUP:
                 case GROUP:

@@ -326,9 +326,6 @@ public class DistributedFlowStatisticStore implements FlowStatisticStore {
                 Instructions.OutputInstruction out = (Instructions.OutputInstruction) i;
                 Instructions.OutputInstruction out = (Instructions.OutputInstruction) i;
                 return out.port();
                 return out.port();
             }
             }
-            if (i.type() == Instruction.Type.DROP) {
-                return PortNumber.P0;
-            }
         }
         }
         return null;
         return null;
     }
     }
@@ -360,4 +357,4 @@ public class DistributedFlowStatisticStore implements FlowStatisticStore {
     private int getMessageHandlerThreadPoolSize() {
     private int getMessageHandlerThreadPoolSize() {
         return messageHandlerThreadPoolSize;
         return messageHandlerThreadPoolSize;
     }
     }
-}
\ No newline at end of file
+}

@@ -312,9 +312,6 @@ public class DistributedStatisticStore implements StatisticStore {
                 Instructions.OutputInstruction out = (Instructions.OutputInstruction) i;
                 Instructions.OutputInstruction out = (Instructions.OutputInstruction) i;
                 return out.port();
                 return out.port();
             }
             }
-            if (i.type() == Instruction.Type.DROP) {
-                return PortNumber.P0;
-            }
         }
         }
         return null;
         return null;
     }
     }

@@ -146,7 +146,6 @@ public class FlowModBuilderVer10 extends FlowModBuilder {
         }
         }
         for (Instruction i : treatment.immediate()) {
         for (Instruction i : treatment.immediate()) {
             switch (i.type()) {
             switch (i.type()) {
-            case DROP:
             case NOACTION:
             case NOACTION:
                 return Collections.emptyList();
                 return Collections.emptyList();
             case L2MODIFICATION:
             case L2MODIFICATION:

@@ -232,7 +232,6 @@ public class FlowModBuilderVer13 extends FlowModBuilder {
         List<OFAction> actions = new LinkedList<>();
         List<OFAction> actions = new LinkedList<>();
         for (Instruction i : treatments) {
         for (Instruction i : treatments) {
             switch (i.type()) {
             switch (i.type()) {
-                case DROP:
                 case NOACTION:
                 case NOACTION:
                     return Collections.emptyList();
                     return Collections.emptyList();
                 case L0MODIFICATION:
                 case L0MODIFICATION:

@@ -235,9 +235,6 @@ public final class GroupModBuilder {
         List<OFAction> actions = new LinkedList<>();
         List<OFAction> actions = new LinkedList<>();
         for (Instruction i : treatment.allInstructions()) {
         for (Instruction i : treatment.allInstructions()) {
             switch (i.type()) {
             switch (i.type()) {
-                case DROP:
-                    log.warn("Saw drop action; assigning drop action");
-                    return Collections.emptyList();
                 case L0MODIFICATION:
                 case L0MODIFICATION:
                     actions.add(buildL0Modification(i));
                     actions.add(buildL0Modification(i));
                     break;
                     break;