홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
Sho SHIMIZU
Committed by Gerrit Code Review
66a8554a 1 parent 75879ef9

Remove enum deprecated in Cardinal 

Change-Id: I8200f75d34156e1233a249fddab79c72b79b7cc3
Inline Side-by-side
Showing 3 changed files with 0 additions and 42 deletions
...@@ -29,43 +29,6 @@ public interface FlowRule { ...@@ -29,43 +29,6 @@ public interface FlowRule {
29 int MIN_PRIORITY = 0; 29 int MIN_PRIORITY = 0;
30 30
31 /** 31 /**
32 - * The FlowRule type is used to determine in which table the flow rule needs
33 - * to be put for multi-table support switch. For single table switch,
34 - * Default is used.
35 - *
36 - * @deprecated in Cardinal Release
37 - */
38 - @Deprecated
39 - enum Type {
40 - /*
41 - * Default type - used in flow rule for single table switch NOTE: this
42 - * setting should not be used as Table 0 in a multi-table pipeline
43 - */
44 - DEFAULT,
45 - /* Used in flow entry for IP table */
46 - IP,
47 - /* Used in flow entry for MPLS table */
48 - MPLS,
49 - /* Used in flow entry for ACL table */
50 - ACL,
51 -
52 - /* VLAN-to-MPLS table */
53 - VLAN_MPLS,
54 -
55 - /* VLAN table */
56 - VLAN,
57 -
58 - /* Ethtype table */
59 - ETHER,
60 -
61 - /* Class of Service table */
62 - COS,
63 -
64 - /* Table 0 in a multi-table pipeline */
65 - FIRST,
66 - }
67 -
68 - /**
69 * Returns the ID of this flow. 32 * Returns the ID of this flow.
70 * 33 *
71 * @return the flow ID 34 * @return the flow ID
......
...@@ -36,7 +36,6 @@ import org.onosproject.net.DeviceId; ...@@ -36,7 +36,6 @@ import org.onosproject.net.DeviceId;
36 import org.onosproject.net.MastershipRole; 36 import org.onosproject.net.MastershipRole;
37 import org.onosproject.net.PortNumber; 37 import org.onosproject.net.PortNumber;
38 import org.onosproject.net.flow.DefaultTrafficTreatment; 38 import org.onosproject.net.flow.DefaultTrafficTreatment;
39 -import org.onosproject.net.flow.FlowRule;
40 import org.onosproject.net.flow.instructions.Instructions; 39 import org.onosproject.net.flow.instructions.Instructions;
41 import org.onosproject.net.flow.instructions.L0ModificationInstruction; 40 import org.onosproject.net.flow.instructions.L0ModificationInstruction;
42 import org.onosproject.net.flow.instructions.L2ModificationInstruction; 41 import org.onosproject.net.flow.instructions.L2ModificationInstruction;
...@@ -168,7 +167,6 @@ public class DistributedGroupStore ...@@ -168,7 +167,6 @@ public class DistributedGroupStore
168 Instructions.OutputInstruction.class, 167 Instructions.OutputInstruction.class,
169 Instructions.GroupInstruction.class, 168 Instructions.GroupInstruction.class,
170 Instructions.TableTypeTransition.class, 169 Instructions.TableTypeTransition.class,
171 - FlowRule.Type.class,
172 L0ModificationInstruction.class, 170 L0ModificationInstruction.class,
173 L0ModificationInstruction.L0SubType.class, 171 L0ModificationInstruction.L0SubType.class,
174 L0ModificationInstruction.ModLambdaInstruction.class, 172 L0ModificationInstruction.ModLambdaInstruction.class,
......
...@@ -19,7 +19,6 @@ import com.google.common.collect.ImmutableList; ...@@ -19,7 +19,6 @@ import com.google.common.collect.ImmutableList;
19 import com.google.common.collect.ImmutableMap; 19 import com.google.common.collect.ImmutableMap;
20 import com.google.common.collect.ImmutableSet; 20 import com.google.common.collect.ImmutableSet;
21 import com.google.common.collect.Maps; 21 import com.google.common.collect.Maps;
22 -
23 import org.onlab.packet.ChassisId; 22 import org.onlab.packet.ChassisId;
24 import org.onlab.packet.EthType; 23 import org.onlab.packet.EthType;
25 import org.onlab.packet.Ip4Address; 24 import org.onlab.packet.Ip4Address;
...@@ -89,7 +88,6 @@ import org.onosproject.net.flow.DefaultTrafficSelector; ...@@ -89,7 +88,6 @@ import org.onosproject.net.flow.DefaultTrafficSelector;
89 import org.onosproject.net.flow.DefaultTrafficTreatment; 88 import org.onosproject.net.flow.DefaultTrafficTreatment;
90 import org.onosproject.net.flow.FlowEntry; 89 import org.onosproject.net.flow.FlowEntry;
91 import org.onosproject.net.flow.FlowId; 90 import org.onosproject.net.flow.FlowId;
92 -import org.onosproject.net.flow.FlowRule;
93 import org.onosproject.net.flow.FlowRuleBatchEntry; 91 import org.onosproject.net.flow.FlowRuleBatchEntry;
94 import org.onosproject.net.flow.FlowRuleBatchEvent; 92 import org.onosproject.net.flow.FlowRuleBatchEvent;
95 import org.onosproject.net.flow.FlowRuleBatchOperation; 93 import org.onosproject.net.flow.FlowRuleBatchOperation;
...@@ -301,7 +299,6 @@ public final class KryoNamespaces { ...@@ -301,7 +299,6 @@ public final class KryoNamespaces {
301 DefaultHostDescription.class, 299 DefaultHostDescription.class,
302 DefaultFlowEntry.class, 300 DefaultFlowEntry.class,
303 StoredFlowEntry.class, 301 StoredFlowEntry.class,
304 - FlowRule.Type.class,
305 DefaultFlowRule.class, 302 DefaultFlowRule.class,
306 DefaultFlowEntry.class, 303 DefaultFlowEntry.class,
307 DefaultPacketRequest.class, 304 DefaultPacketRequest.class,
......