Remove Instruction.DROP deprecated in Emu
Change-Id: Ida5a5f489815dd1e972f6bfc8646e1e1bf0e8edd
diff --git a/cli/src/main/java/org/onosproject/cli/net/GetFlowStatistics.java b/cli/src/main/java/org/onosproject/cli/net/GetFlowStatistics.java
index f2e977c..4eed352 100644
--- a/cli/src/main/java/org/onosproject/cli/net/GetFlowStatistics.java
+++ b/cli/src/main/java/org/onosproject/cli/net/GetFlowStatistics.java
@@ -275,9 +275,7 @@
private Instruction.Type getInstructionType(String instType) {
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;
} else if (instTypeUC.equals("GROUP")) {
return Instruction.Type.GROUP;
diff --git a/core/api/src/main/java/org/onosproject/net/flow/DefaultTrafficTreatment.java b/core/api/src/main/java/org/onosproject/net/flow/DefaultTrafficTreatment.java
index 6adf615..3934722 100644
--- a/core/api/src/main/java/org/onosproject/net/flow/DefaultTrafficTreatment.java
+++ b/core/api/src/main/java/org/onosproject/net/flow/DefaultTrafficTreatment.java
@@ -235,7 +235,6 @@
public Builder add(Instruction instruction) {
switch (instruction.type()) {
- case DROP:
case NOACTION:
case OUTPUT:
case GROUP:
diff --git a/core/api/src/main/java/org/onosproject/net/flow/instructions/Instruction.java b/core/api/src/main/java/org/onosproject/net/flow/instructions/Instruction.java
index a19d06a..f497e49 100644
--- a/core/api/src/main/java/org/onosproject/net/flow/instructions/Instruction.java
+++ b/core/api/src/main/java/org/onosproject/net/flow/instructions/Instruction.java
@@ -25,13 +25,6 @@
*/
enum Type {
/**
- * Signifies that the traffic should be dropped.
- * @deprecated 1.4.0 Emu Release
- */
- @Deprecated
- DROP,
-
- /**
* Signifies that the traffic requires no action.
*
* In OF10, the behavior of NOACTION is DROP.
diff --git a/core/common/src/main/java/org/onosproject/codec/impl/EncodeInstructionCodecHelper.java b/core/common/src/main/java/org/onosproject/codec/impl/EncodeInstructionCodecHelper.java
index 6322ba9..eae8251 100644
--- a/core/common/src/main/java/org/onosproject/codec/impl/EncodeInstructionCodecHelper.java
+++ b/core/common/src/main/java/org/onosproject/codec/impl/EncodeInstructionCodecHelper.java
@@ -251,7 +251,6 @@
result.put(InstructionCodec.PORT, outputInstruction.port().toString());
break;
- case DROP:
case NOACTION:
break;
diff --git a/core/common/src/test/java/org/onosproject/store/trivial/SimpleStatisticStore.java b/core/common/src/test/java/org/onosproject/store/trivial/SimpleStatisticStore.java
index 370686f..4212273 100644
--- a/core/common/src/test/java/org/onosproject/store/trivial/SimpleStatisticStore.java
+++ b/core/common/src/test/java/org/onosproject/store/trivial/SimpleStatisticStore.java
@@ -168,9 +168,6 @@
Instructions.OutputInstruction out = (Instructions.OutputInstruction) i;
return out.port();
}
- if (i.type() == Instruction.Type.DROP) {
- return PortNumber.P0;
- }
}
return null;
}
diff --git a/core/net/src/main/java/org/onosproject/net/flowobjective/impl/composition/FlowObjectiveCompositionUtil.java b/core/net/src/main/java/org/onosproject/net/flowobjective/impl/composition/FlowObjectiveCompositionUtil.java
index c552373..74397b0 100644
--- a/core/net/src/main/java/org/onosproject/net/flowobjective/impl/composition/FlowObjectiveCompositionUtil.java
+++ b/core/net/src/main/java/org/onosproject/net/flowobjective/impl/composition/FlowObjectiveCompositionUtil.java
@@ -170,8 +170,6 @@
for (Instruction instruction : trafficTreatment.allInstructions()) {
switch (instruction.type()) {
- case DROP:
- return null;
case OUTPUT:
break;
case GROUP:
diff --git a/core/store/dist/src/main/java/org/onosproject/store/statistic/impl/DistributedFlowStatisticStore.java b/core/store/dist/src/main/java/org/onosproject/store/statistic/impl/DistributedFlowStatisticStore.java
index c3f907a..dd28810 100644
--- a/core/store/dist/src/main/java/org/onosproject/store/statistic/impl/DistributedFlowStatisticStore.java
+++ b/core/store/dist/src/main/java/org/onosproject/store/statistic/impl/DistributedFlowStatisticStore.java
@@ -326,9 +326,6 @@
Instructions.OutputInstruction out = (Instructions.OutputInstruction) i;
return out.port();
}
- if (i.type() == Instruction.Type.DROP) {
- return PortNumber.P0;
- }
}
return null;
}
@@ -360,4 +357,4 @@
private int getMessageHandlerThreadPoolSize() {
return messageHandlerThreadPoolSize;
}
-}
\ No newline at end of file
+}
diff --git a/core/store/dist/src/main/java/org/onosproject/store/statistic/impl/DistributedStatisticStore.java b/core/store/dist/src/main/java/org/onosproject/store/statistic/impl/DistributedStatisticStore.java
index a483194..edbd68d 100644
--- a/core/store/dist/src/main/java/org/onosproject/store/statistic/impl/DistributedStatisticStore.java
+++ b/core/store/dist/src/main/java/org/onosproject/store/statistic/impl/DistributedStatisticStore.java
@@ -312,9 +312,6 @@
Instructions.OutputInstruction out = (Instructions.OutputInstruction) i;
return out.port();
}
- if (i.type() == Instruction.Type.DROP) {
- return PortNumber.P0;
- }
}
return null;
}
diff --git a/providers/openflow/flow/src/main/java/org/onosproject/provider/of/flow/impl/FlowModBuilderVer10.java b/providers/openflow/flow/src/main/java/org/onosproject/provider/of/flow/impl/FlowModBuilderVer10.java
index d4ebb4f..ddf8bab 100644
--- a/providers/openflow/flow/src/main/java/org/onosproject/provider/of/flow/impl/FlowModBuilderVer10.java
+++ b/providers/openflow/flow/src/main/java/org/onosproject/provider/of/flow/impl/FlowModBuilderVer10.java
@@ -146,7 +146,6 @@
}
for (Instruction i : treatment.immediate()) {
switch (i.type()) {
- case DROP:
case NOACTION:
return Collections.emptyList();
case L2MODIFICATION:
diff --git a/providers/openflow/flow/src/main/java/org/onosproject/provider/of/flow/impl/FlowModBuilderVer13.java b/providers/openflow/flow/src/main/java/org/onosproject/provider/of/flow/impl/FlowModBuilderVer13.java
index 296f7e4..912e915 100644
--- a/providers/openflow/flow/src/main/java/org/onosproject/provider/of/flow/impl/FlowModBuilderVer13.java
+++ b/providers/openflow/flow/src/main/java/org/onosproject/provider/of/flow/impl/FlowModBuilderVer13.java
@@ -232,7 +232,6 @@
List<OFAction> actions = new LinkedList<>();
for (Instruction i : treatments) {
switch (i.type()) {
- case DROP:
case NOACTION:
return Collections.emptyList();
case L0MODIFICATION:
diff --git a/providers/openflow/group/src/main/java/org/onosproject/provider/of/group/impl/GroupModBuilder.java b/providers/openflow/group/src/main/java/org/onosproject/provider/of/group/impl/GroupModBuilder.java
index d64d81b..cecdba6 100644
--- a/providers/openflow/group/src/main/java/org/onosproject/provider/of/group/impl/GroupModBuilder.java
+++ b/providers/openflow/group/src/main/java/org/onosproject/provider/of/group/impl/GroupModBuilder.java
@@ -235,9 +235,6 @@
List<OFAction> actions = new LinkedList<>();
for (Instruction i : treatment.allInstructions()) {
switch (i.type()) {
- case DROP:
- log.warn("Saw drop action; assigning drop action");
- return Collections.emptyList();
case L0MODIFICATION:
actions.add(buildL0Modification(i));
break;