Bug 1299 - OF10 plugin sending Stats Request type 13

Once node connect to the plugin, it sends port desciption statistics request to the node.
This statistic request is only defined for openflow 1.3+ switches. Added the condition
to avoid sending this request to openflow 1.0 switch

Change-Id: I10a81a7e83efc0e75eb4581ea24b226626625a26
Signed-off-by: Anilkumar Vishnoi <avishnoi@in.ibm.com>

diff --git a/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/ConnectionConductorImpl.java b/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/ConnectionConductorImpl.java
index 81b22925afa13134ef99291bc2f2236d17dfddd2..da09a63acf7835e830a1026d65cceaa2b3871c16 100644 (file)
--- a/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/ConnectionConductorImpl.java
+++ b/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/ConnectionConductorImpl.java
@@ -420,6 +420,7 @@ public class ConnectionConductorImpl implements OpenflowProtocolListener,
         
         // post-handshake actions
         if(version == OFConstants.OFP_VERSION_1_3){
+            requestPorts();
             requestGroupFeatures();
             requestMeterFeatures();
         } else if (version == OFConstants.OFP_VERSION_1_0) {
@@ -430,7 +431,6 @@ public class ConnectionConductorImpl implements OpenflowProtocolListener,
         }
         
         requestDesc();
-        requestPorts();
     }
 
     /**

diff --git a/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/ConnectionConductorImplTest.java b/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/ConnectionConductorImplTest.java
index 3a6aa385f94ea2b47cc21a2125f8c5e162c6b34f..390846972ba74002670fb2fecb759daba6375115 100644 (file)
--- a/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/ConnectionConductorImplTest.java
+++ b/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/ConnectionConductorImplTest.java
@@ -307,7 +307,6 @@ public class ConnectionConductorImplTest {
                 EventFactory.DEFAULT_VERSION, getFeatureResponseMsg()));
         
         eventPlan.add(0, EventFactory.createDefaultWaitForRpcEvent(1, "multipartRequestInput"));
-        eventPlan.add(0, EventFactory.createDefaultWaitForRpcEvent(2, "multipartRequestInput"));
 
         executeNow();
 
@@ -344,7 +343,6 @@ public class ConnectionConductorImplTest {
                 EventFactory.DEFAULT_VERSION, getFeatureResponseMsg()));
         
         eventPlan.add(0, EventFactory.createDefaultWaitForRpcEvent(1, "multipartRequestInput"));
-        eventPlan.add(0, EventFactory.createDefaultWaitForRpcEvent(2, "multipartRequestInput"));
 
         executeNow();