Sho SHIMIZU
Committed by Gerrit Code Review

Remove enum deprecated in Cardinal

Change-Id: I8200f75d34156e1233a249fddab79c72b79b7cc3
......@@ -29,43 +29,6 @@ public interface FlowRule {
int MIN_PRIORITY = 0;
/**
* The FlowRule type is used to determine in which table the flow rule needs
* to be put for multi-table support switch. For single table switch,
* Default is used.
*
* @deprecated in Cardinal Release
*/
@Deprecated
enum Type {
/*
* Default type - used in flow rule for single table switch NOTE: this
* setting should not be used as Table 0 in a multi-table pipeline
*/
DEFAULT,
/* Used in flow entry for IP table */
IP,
/* Used in flow entry for MPLS table */
MPLS,
/* Used in flow entry for ACL table */
ACL,
/* VLAN-to-MPLS table */
VLAN_MPLS,
/* VLAN table */
VLAN,
/* Ethtype table */
ETHER,
/* Class of Service table */
COS,
/* Table 0 in a multi-table pipeline */
FIRST,
}
/**
* Returns the ID of this flow.
*
* @return the flow ID
......
......@@ -36,7 +36,6 @@ import org.onosproject.net.DeviceId;
import org.onosproject.net.MastershipRole;
import org.onosproject.net.PortNumber;
import org.onosproject.net.flow.DefaultTrafficTreatment;
import org.onosproject.net.flow.FlowRule;
import org.onosproject.net.flow.instructions.Instructions;
import org.onosproject.net.flow.instructions.L0ModificationInstruction;
import org.onosproject.net.flow.instructions.L2ModificationInstruction;
......@@ -168,7 +167,6 @@ public class DistributedGroupStore
Instructions.OutputInstruction.class,
Instructions.GroupInstruction.class,
Instructions.TableTypeTransition.class,
FlowRule.Type.class,
L0ModificationInstruction.class,
L0ModificationInstruction.L0SubType.class,
L0ModificationInstruction.ModLambdaInstruction.class,
......
......@@ -19,7 +19,6 @@ import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Maps;
import org.onlab.packet.ChassisId;
import org.onlab.packet.EthType;
import org.onlab.packet.Ip4Address;
......@@ -89,7 +88,6 @@ import org.onosproject.net.flow.DefaultTrafficSelector;
import org.onosproject.net.flow.DefaultTrafficTreatment;
import org.onosproject.net.flow.FlowEntry;
import org.onosproject.net.flow.FlowId;
import org.onosproject.net.flow.FlowRule;
import org.onosproject.net.flow.FlowRuleBatchEntry;
import org.onosproject.net.flow.FlowRuleBatchEvent;
import org.onosproject.net.flow.FlowRuleBatchOperation;
......@@ -301,7 +299,6 @@ public final class KryoNamespaces {
DefaultHostDescription.class,
DefaultFlowEntry.class,
StoredFlowEntry.class,
FlowRule.Type.class,
DefaultFlowRule.class,
DefaultFlowEntry.class,
DefaultPacketRequest.class,
......