Merge "Unified Two Phase Commit implementation, fixed BA to BI connection"

[controller.git] / opendaylight / protocol_plugins / openflow / src / main / java / org / opendaylight / controller / protocol_plugin / openflow / core / ISwitch.java

diff --git a/opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/core/ISwitch.java b/opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/core/ISwitch.java
index 41da311fd916dc8c1913b98f19976d9b319bf7d8..d924b66a0991d50edd74b925e14a7e1809a7e321 100644 (file)
--- a/opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/core/ISwitch.java
+++ b/opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/core/ISwitch.java
@@ -119,6 +119,8 @@ public interface ISwitch {
      *
      * @param msg
      *            The OF message to be sent
+     * @param xid
+     *            The XID to be used in the message
      * @return The XID used
      */
     public Integer asyncFastSend(OFMessage msg, int xid);
@@ -175,6 +177,7 @@ public interface ISwitch {
      * Returns True if the port is enabled,
      *
      * @param portNumber
+     *            the port ID
      * @return True if the port is enabled
      */
     public boolean isPortEnabled(short portNumber);
@@ -183,6 +186,7 @@ public interface ISwitch {
      * Returns True if the port is enabled.
      *
      * @param port
+     *            the OpenFlow port
      * @return True if the port is enabled
      */
     public boolean isPortEnabled(OFPhysicalPort port);
@@ -220,12 +224,17 @@ public interface ISwitch {
      * Send Barrier message synchronously. The caller will be blocked until the
      * Barrier reply arrives.
      */
-    Object syncSendBarrierMessage();
+    public Object syncSendBarrierMessage();
 
     /**
      * Send Barrier message asynchronously. The caller is not blocked. The
      * Barrier message will be sent in a transmit thread which will be blocked
      * until the Barrier reply arrives.
      */
-    Object asyncSendBarrierMessage();
+    public Object asyncSendBarrierMessage();
+
+    /**
+     * Send a FLOW_MOD message with a wildcard match and action=DELETE.
+     */
+    public void deleteAllFlows();
 }