Low level openflow drivers have been promoted to the driver subsystem.
All new device drivers should provide a handshaking behaviour as well
as well as a pipeline behaviour.
Change-Id: I883830b074e5d254a8cc6100e6c4fa0023594a36
diff --git a/openflow/api/src/main/java/org/onosproject/openflow/controller/OpenFlowSwitch.java b/openflow/api/src/main/java/org/onosproject/openflow/controller/OpenFlowSwitch.java
index 89ac278..5a89543 100644
--- a/openflow/api/src/main/java/org/onosproject/openflow/controller/OpenFlowSwitch.java
+++ b/openflow/api/src/main/java/org/onosproject/openflow/controller/OpenFlowSwitch.java
@@ -15,12 +15,11 @@
*/
package org.onosproject.openflow.controller;
-import java.util.List;
-
import org.projectfloodlight.openflow.protocol.OFFactory;
import org.projectfloodlight.openflow.protocol.OFMessage;
import org.projectfloodlight.openflow.protocol.OFPortDesc;
-import org.projectfloodlight.openflow.types.TableId;
+
+import java.util.List;
/**
* Represents to provider facing side of a switch.
@@ -28,38 +27,6 @@
public interface OpenFlowSwitch {
/**
- * The TableType is used to determine in which table (TableID) each flow rule
- * needs to be put for multi-table support switch.
- * It is used only for multi-table support switch.
- */
- public static enum TableType {
- /* VLAN-to-MPLS table */
- VLAN_MPLS,
-
- /* VLAN table */
- VLAN,
-
- /* Ethertype table */
- ETHER,
-
- /* Class of Service table */
- COS,
-
- /* IP table */
- IP,
- /* MPLS table */
- MPLS,
- /* ACL table */
- ACL,
- /* Single table */
- NONE,
- /* First table in multi-table */
- FIRST,
-
-
- }
-
- /**
* Writes the message to the driver.
*
* @param msg the message to write
@@ -74,17 +41,6 @@
public void sendMsg(List<OFMessage> msgs);
/**
- * Transforms FlowMod messages by setting the correct table-ids and sending
- * them to the switch. TableType is used to determine the table ID for the OFMessage.
- * Switch drivers that supports multi-table pipelines should implement this
- * method.
- *
- * @param msg the message to be written
- * @param tableType the type of table in which the FlowMods need to be inserted
- */
- public void transformAndSendMsg(OFMessage msg, TableType tableType);
-
- /**
* Handle a message from the switch.
* @param fromSwitch the message to handle
*/
@@ -192,12 +148,4 @@
* @return string representation of the connection to the device
*/
public String channelId();
-
- /**
- * Returns the TableType corresponding to the TableId used to identify
- * a table in an OpenFlow switch.
- * @param tid identifies a table in an OpenFlow switch using TableId
- * @return TableType corresponding to 'tid' identifying the type of table
- */
- public TableType getTableType(TableId tid);
}