ONOS-961: Supports GROUP_STATS and GROUP_DESC_STATS events in OpenFlowController…

… for OpenFlowGroupProvider. Change-Id: Iea5e7a2a37a7a44367c54e99db44eb9399d48175

ONOS-961: Supports GROUP_STATS and GROUP_DESC_STATS events in OpenFlowController…
… for OpenFlowGroupProvider. Change-Id: Iea5e7a2a37a7a44367c54e99db44eb9399d48175
sangho · Jonathan Hart
Commit 6a0bb17d284959bc3e318cccd178ef003588ef86 6a0bb17d 1 parent 73ba84aa
Showing 1 changed file with 69 additions and 14 deletions
openflow/ctl/src/main/java/org/onosproject/openflow/controller/impl/OpenFlowControllerImpl.java
--- a/openflow/ctl/src/main/java/org/onosproject/openflow/controller/impl/OpenFlowControllerImpl.java
View file @6a0bb17
+++ b/openflow/ctl/src/main/java/org/onosproject/openflow/controller/impl/OpenFlowControllerImpl.java
View file @6a0bb17
@@ -46,13 +46,16 @@ import org.projectfloodlight.openflow.protocol.OFExperimenter;
 import org.projectfloodlight.openflow.protocol.OFFactories;
 import org.projectfloodlight.openflow.protocol.OFFlowStatsEntry;
 import org.projectfloodlight.openflow.protocol.OFFlowStatsReply;
+import org.projectfloodlight.openflow.protocol.OFGroupDescStatsEntry;
+import org.projectfloodlight.openflow.protocol.OFGroupDescStatsReply;
+import org.projectfloodlight.openflow.protocol.OFGroupStatsEntry;
+import org.projectfloodlight.openflow.protocol.OFGroupStatsReply;
 import org.projectfloodlight.openflow.protocol.OFMessage;
 import org.projectfloodlight.openflow.protocol.OFPacketIn;
 import org.projectfloodlight.openflow.protocol.OFPortDesc;
 import org.projectfloodlight.openflow.protocol.OFPortStatus;
 import org.projectfloodlight.openflow.protocol.OFStatsReply;
 import org.projectfloodlight.openflow.protocol.OFStatsReplyFlags;
-import org.projectfloodlight.openflow.protocol.OFStatsType;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -90,7 +93,13 @@ public class OpenFlowControllerImpl implements OpenFlowController {
     protected Set<OpenFlowEventListener> ofEventListener = Sets.newHashSet();
-    protected Multimap<Dpid, OFFlowStatsEntry> fullStats =
+    protected Multimap<Dpid, OFFlowStatsEntry> fullFlowStats =
+            ArrayListMultimap.create();
+
+    protected Multimap<Dpid, OFGroupStatsEntry> fullGroupStats =
+            ArrayListMultimap.create();
+
+    protected Multimap<Dpid, OFGroupDescStatsEntry> fullGroupDescStats =
             ArrayListMultimap.create();
     private final Controller ctrl = new Controller();
@@ -174,7 +183,10 @@ public class OpenFlowControllerImpl implements OpenFlowController {
     @Override
     public void processPacket(Dpid dpid, OFMessage msg) {
-        Collection<OFFlowStatsEntry> stats;
+        Collection<OFFlowStatsEntry> flowStats;
+        Collection<OFGroupStatsEntry> groupStats;
+        Collection<OFGroupDescStatsEntry> groupDescStats;
+
         switch (msg.getType()) {
         case PORT_STATUS:
             for (OpenFlowSwitchListener l : ofSwitchListener) {
@@ -202,19 +214,46 @@ public class OpenFlowControllerImpl implements OpenFlowController {
             break;
         case STATS_REPLY:
             OFStatsReply reply = (OFStatsReply) msg;
-            if (reply.getStatsType().equals(OFStatsType.PORT_DESC)) {
+            switch (reply.getStatsType()) {
+                case PORT_DESC:
                     for (OpenFlowSwitchListener l : ofSwitchListener) {
                         l.switchChanged(dpid);
                     }
-            }
+                    break;
-            stats = publishStats(dpid, reply);
+                case FLOW:
-            if (stats != null) {
+                    flowStats = publishFlowStats(dpid, (OFFlowStatsReply) reply);
+                    if (flowStats != null) {
                         OFFlowStatsReply.Builder rep =
                                 OFFactories.getFactory(msg.getVersion()).buildFlowStatsReply();
-                rep.setEntries(Lists.newLinkedList(stats));
+                        rep.setEntries(Lists.newLinkedList(flowStats));
+                        executorMsgs.submit(new OFMessageHandler(dpid, rep.build()));
+                    }
+                    break;
+                case GROUP:
+                    groupStats = publishGroupStats(dpid, (OFGroupStatsReply) reply);
+                    if (groupStats != null) {
+                        OFGroupStatsReply.Builder rep =
+                                OFFactories.getFactory(msg.getVersion()).buildGroupStatsReply();
+                        rep.setEntries(Lists.newLinkedList(groupStats));
+                        rep.setXid(reply.getXid());
+                        executorMsgs.submit(new OFMessageHandler(dpid, rep.build()));
+                    }
+                    break;
+                case GROUP_DESC:
+                    groupDescStats = publishGroupDescStats(dpid,
+                            (OFGroupDescStatsReply) reply);
+                    if (groupDescStats != null) {
+                        OFGroupDescStatsReply.Builder rep =
+                            OFFactories.getFactory(msg.getVersion()).buildGroupDescStatsReply();
+                        rep.setEntries(Lists.newLinkedList(groupDescStats));
+                        rep.setXid(reply.getXid());
                         executorMsgs.submit(new OFMessageHandler(dpid, rep.build()));
                     }
                     break;
+                default:
+                    log.warn("Unsupported stats type : {}", reply.getStatsType());
+            }
+            break;
         case BARRIER_REPLY:
             executorBarrier.submit(new OFMessageHandler(dpid, msg));
             break;
@@ -244,16 +283,32 @@ public class OpenFlowControllerImpl implements OpenFlowController {
         }
     }
-    private synchronized Collection<OFFlowStatsEntry> publishStats(Dpid dpid,
+    private synchronized Collection<OFFlowStatsEntry> publishFlowStats(Dpid dpid,
-                                                                   OFStatsReply reply) {
+                                                                       OFFlowStatsReply reply) {
         //TODO: Get rid of synchronized
-        if (reply.getStatsType() != OFStatsType.FLOW) {
+        fullFlowStats.putAll(dpid, reply.getEntries());
+        if (!reply.getFlags().contains(OFStatsReplyFlags.REPLY_MORE)) {
+            return fullFlowStats.removeAll(dpid);
+        }
         return null;
     }
-        final OFFlowStatsReply replies = (OFFlowStatsReply) reply;
+
-        fullStats.putAll(dpid, replies.getEntries());
+    private synchronized Collection<OFGroupStatsEntry> publishGroupStats(Dpid dpid,
+                                                                      OFGroupStatsReply reply) {
+        //TODO: Get rid of synchronized
+        fullGroupStats.putAll(dpid, reply.getEntries());
+        if (!reply.getFlags().contains(OFStatsReplyFlags.REPLY_MORE)) {
+            return fullGroupStats.removeAll(dpid);
+        }
+        return null;
+    }
+
+    private synchronized Collection<OFGroupDescStatsEntry> publishGroupDescStats(Dpid dpid,
+                                                                  OFGroupDescStatsReply reply) {
+        //TODO: Get rid of synchronized
+        fullGroupDescStats.putAll(dpid, reply.getEntries());
         if (!reply.getFlags().contains(OFStatsReplyFlags.REPLY_MORE)) {
-            return fullStats.removeAll(dpid);
+            return fullGroupDescStats.removeAll(dpid);
         }
         return null;
     }