commit 1745e5abbd4cf908579d79af77c3095970095d10
author Yuta HIGUCHI <y-higuchi@ak.jp.nec.com> Sun Jan 15 21:43:02 2017 -0800
committer Ray Milkey <ray@onlab.us> Thu Jan 19 19:30:46 2017 +0000
tree 1a7be3f9bd24d3626269648ac56ffeedb147e02b
parent af96a210bc805eb695d4047615a174b239a20149

Idle OF channel handling

- Added handler for idle OF channel
- Workaround for device not responding to meter feature request (ONOS-5834)

Change-Id: I72435c65fa427c3f7668a0042b9425eb726cd54e

protocols/openflow/ctl/src/main/java/org/onosproject/openflow/controller/impl/OFChannelHandler.java

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 eedfaf2..11cff69 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
@@ -619,6 +619,15 @@
                     throws IOException {
                 h.pendingPortStatusMsg.add(m);
             }
+
+            @Override
+            void processIdle(OFChannelHandler h) throws IOException {
+                log.info("{} did not respond to MeterFeaturesRequest, " +
+                         "moving on without it.",
+                         h.getSwitchInfoString());
+                h.sendHandshakeDescriptionStatsRequest();
+                h.setState(WAIT_DESCRIPTION_STAT_REPLY);
+            }
         },
 
 
@@ -719,6 +728,11 @@
                 h.dispatchMessage(m);
             }
 
+            @Override
+            void processIdle(OFChannelHandler h) throws IOException {
+                log.info("{} idle", h.getSwitchInfoString());
+            }
+
         };
 
         private final boolean handshakeComplete;
@@ -1098,6 +1112,11 @@
             unhandledMessageReceived(h, m);
         }
 
+        void processIdle(OFChannelHandler h) throws IOException {
+            // disconnect channel which did no complete handshake
+            log.error("{} idle in state {}, disconnecting", h.getSwitchInfoString(), this);
+            h.channel.disconnect();
+        }
     }
 
 
@@ -1215,6 +1234,7 @@
         e.getChannel().write(Collections.singletonList(m));
         // XXX S some problems here -- echo request has no transaction id, and
         // echo reply is not correlated to the echo request.
+        state.processIdle(this);
     }
 
     @Override