mirrors/onos
1
0
Fork 0
mirror of https://github.com/opennetworkinglab/onos.git synced 2025-10-25 22:31:07 +02:00
Code Issues Projects Releases Wiki Activity

Remove enum deprecated in Cardinal

Browse Source 
Change-Id: I8200f75d34156e1233a249fddab79c72b79b7cc3
This commit is contained in:
Sho SHIMIZU 2015-09-25 10:15:17 -07:00 committed by Gerrit Code Review
parent 75879ef98f
commit 66a8554a17
3 changed files with 0 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
core/api/src/main/java/org/onosproject/net/flow/FlowRule.java
View File

@ -28,43 +28,6 @@ public interface FlowRule {
int MAX_TIMEOUT = 60; int MAX_TIMEOUT = 60;
int MIN_PRIORITY = 0; 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. * Returns the ID of this flow.
* *

2
core/store/dist/src/main/java/org/onosproject/store/group/impl/DistributedGroupStore.java vendored
View File

@ -36,7 +36,6 @@ import org.onosproject.net.DeviceId;
import org.onosproject.net.MastershipRole; import org.onosproject.net.MastershipRole;
import org.onosproject.net.PortNumber; import org.onosproject.net.PortNumber;
import org.onosproject.net.flow.DefaultTrafficTreatment; 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.Instructions;
import org.onosproject.net.flow.instructions.L0ModificationInstruction; import org.onosproject.net.flow.instructions.L0ModificationInstruction;
import org.onosproject.net.flow.instructions.L2ModificationInstruction; import org.onosproject.net.flow.instructions.L2ModificationInstruction;
@ -168,7 +167,6 @@ public class DistributedGroupStore
Instructions.OutputInstruction.class, Instructions.OutputInstruction.class,
Instructions.GroupInstruction.class, Instructions.GroupInstruction.class,
Instructions.TableTypeTransition.class, Instructions.TableTypeTransition.class,
FlowRule.Type.class,
L0ModificationInstruction.class, L0ModificationInstruction.class,
L0ModificationInstruction.L0SubType.class, L0ModificationInstruction.L0SubType.class,
L0ModificationInstruction.ModLambdaInstruction.class, L0ModificationInstruction.ModLambdaInstruction.class,

3
core/store/serializers/src/main/java/org/onosproject/store/serializers/KryoNamespaces.java
View File

@ -19,7 +19,6 @@ import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableMap;
import com.google.common.collect.ImmutableSet; import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Maps; import com.google.common.collect.Maps;
import org.onlab.packet.ChassisId; import org.onlab.packet.ChassisId;
import org.onlab.packet.EthType; import org.onlab.packet.EthType;
import org.onlab.packet.Ip4Address; 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.DefaultTrafficTreatment;
import org.onosproject.net.flow.FlowEntry; import org.onosproject.net.flow.FlowEntry;
import org.onosproject.net.flow.FlowId; import org.onosproject.net.flow.FlowId;
import org.onosproject.net.flow.FlowRule;
import org.onosproject.net.flow.FlowRuleBatchEntry; import org.onosproject.net.flow.FlowRuleBatchEntry;
import org.onosproject.net.flow.FlowRuleBatchEvent; import org.onosproject.net.flow.FlowRuleBatchEvent;
import org.onosproject.net.flow.FlowRuleBatchOperation; import org.onosproject.net.flow.FlowRuleBatchOperation;
@ -301,7 +299,6 @@ public final class KryoNamespaces {
DefaultHostDescription.class, DefaultHostDescription.class,
DefaultFlowEntry.class, DefaultFlowEntry.class,
StoredFlowEntry.class, StoredFlowEntry.class,
FlowRule.Type.class,
DefaultFlowRule.class, DefaultFlowRule.class,
DefaultFlowEntry.class, DefaultFlowEntry.class,
DefaultPacketRequest.class, DefaultPacketRequest.class,