| commit | d24420f41e9c0177c2fdd76222b73d9ea05e5576 | [log] [tgz] |
|---|---|---|
| author | Marc De Leenheer <marc@onlab.us> | Wed May 27 09:40:59 2015 -0700 |
| committer | Gerrit Code Review <gerrit@onlab.us> | Thu May 28 22:53:42 2015 +0000 |
| tree | b545108e53836ecea298b1e7e37d205865c64446 | |
| parent | 5f429d675c0a511d60debd4a1bfd9ddf57658482 [diff] |
Add OCh signal type to optical path intent. Revert changes to LINC-OE specialized flowmod handling. Change-Id: Ic4f333a44b7cd8a3111bfcba87ea909943eec56d
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 0d2dc3a..49ca5a8 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
@@ -148,16 +148,4 @@ * @return string representation of the connection to the device */ String channelId(); - - /** - * Prepares a message to be sent, if necessary. Default is to do nothing, - * since most Devices do not need to pre-process a message that's about to - * be sent. - * - * @param msg The message to prepare for sending - * @return the prepared OFMessage - */ - default OFMessage prepareMessage(OFMessage msg) { - return msg; - } }
diff --git a/openflow/api/src/main/java/org/onosproject/openflow/controller/driver/AbstractOpenFlowSwitch.java b/openflow/api/src/main/java/org/onosproject/openflow/controller/driver/AbstractOpenFlowSwitch.java index 94e82a2..43f3d68 100644 --- a/openflow/api/src/main/java/org/onosproject/openflow/controller/driver/AbstractOpenFlowSwitch.java +++ b/openflow/api/src/main/java/org/onosproject/openflow/controller/driver/AbstractOpenFlowSwitch.java
@@ -97,7 +97,7 @@ @Override public final void sendMsg(OFMessage m) { if (role == RoleState.MASTER && channel.isWritable()) { - channel.write(Collections.singletonList(prepareMessage(m))); + channel.write(Collections.singletonList(m)); } }