| commit | 30d1965a3232fb05b762b14ee64b36604874d1c9 | [log] [tgz] |
|---|---|---|
| author | Ray Milkey <ray@onlab.us> | Tue Sep 06 12:09:46 2016 -0700 |
| committer | Ray Milkey <ray@onlab.us> | Tue Sep 06 12:09:46 2016 -0700 |
| tree | 56ff0f34e8b88f082840355caafac981dc86d932 | |
| parent | 16144ba3df1d268c84f493fdca11d0a332591ed1 [diff] |
Add OF 1.3 status for reasserting master controller Change-Id: Ibd25eb8189f67bc8a5107ea0245cfbdee24549ed
diff --git a/protocols/openflow/ctl/src/main/java/org/onosproject/openflow/controller/impl/OFChannelHandler.java b/protocols/openflow/ctl/src/main/java/org/onosproject/openflow/controller/impl/OFChannelHandler.java index 624bea4..9106710 100644 --- a/protocols/openflow/ctl/src/main/java/org/onosproject/openflow/controller/impl/OFChannelHandler.java +++ b/protocols/openflow/ctl/src/main/java/org/onosproject/openflow/controller/impl/OFChannelHandler.java
@@ -576,8 +576,10 @@ throws IOException, SwitchStateException { // if we get here, then the error message is for something else if (m.getErrType() == OFErrorType.BAD_REQUEST && + (((OFBadRequestErrorMsg) m).getCode() == + OFBadRequestCode.EPERM) || ((OFBadRequestErrorMsg) m).getCode() == - OFBadRequestCode.EPERM) { + OFBadRequestCode.IS_SLAVE) { // We are the master controller and the switch returned // a permission error. This is a likely indicator that // the switch thinks we are slave. Reassert our