commit d1212c787f9e639c31d5abb0260851a0dcf6f883
author Viswanath KSP <kspviswa.github@gmail.com> Fri Oct 21 01:03:35 2016 +0530
committer Gerrit Code Review <gerrit@onlab.us> Mon Oct 24 16:11:33 2016 +0000
tree f7aaeb88bceb8183f445b78be91903c378cbb237
parent fbf653c9d466be7d07ac2a13942e7aed4c946ba2

Adding changes for [onos-5525]
Patchset-2 Fixed code as per review comments
Patchset-3 Fixed code as per review comments

Change-Id: I54783f3be09be76ef515fd6495d48376dba686b2

web/gui/src/main/java/org/onosproject/ui/impl/FlowViewMessageHandler.java

diff --git a/web/gui/src/main/java/org/onosproject/ui/impl/FlowViewMessageHandler.java b/web/gui/src/main/java/org/onosproject/ui/impl/FlowViewMessageHandler.java
index 900a3af..4e0c939 100644
--- a/web/gui/src/main/java/org/onosproject/ui/impl/FlowViewMessageHandler.java
+++ b/web/gui/src/main/java/org/onosproject/ui/impl/FlowViewMessageHandler.java
@@ -19,8 +19,11 @@
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.google.common.base.Strings;
 import com.google.common.collect.ImmutableSet;
+import org.onosproject.core.ApplicationId;
+import org.onosproject.core.DefaultApplicationId;
 import org.onosproject.net.DeviceId;
 import org.onosproject.net.flow.FlowEntry;
+import org.onosproject.net.flow.FlowRule;
 import org.onosproject.net.flow.FlowRuleService;
 import org.onosproject.net.flow.criteria.Criterion;
 import org.onosproject.net.flow.instructions.Instruction;
@@ -47,7 +50,13 @@
     private static final String FLOW_DATA_RESP = "flowDataResponse";
     private static final String FLOWS = "flows";
 
+    private static final String FLOW_DETAILS_REQ = "flowDetailsRequest";
+    private static final String FLOW_DETAILS_RESP = "flowDetailsResponse";
+    private static final String DETAILS = "details";
+    private static final String FLOW_PRIORITY = "priority";
+
     private static final String ID = "id";
+    private static final String FLOW_ID = "flowId";
     private static final String APP_ID = "appId";
     private static final String GROUP_ID = "groupId";
     private static final String TABLE_ID = "tableId";
@@ -69,7 +78,10 @@
 
     @Override
     protected Collection<RequestHandler> createRequestHandlers() {
-        return ImmutableSet.of(new FlowDataRequest());
+        return ImmutableSet.of(
+                new FlowDataRequest(),
+                new DetailRequestHandler()
+        );
     }
 
     // handler for flow table requests
@@ -183,4 +195,43 @@
             return sb;
         }
     }
+
+    private final class DetailRequestHandler extends RequestHandler {
+        private DetailRequestHandler() {
+            super(FLOW_DETAILS_REQ);
+        }
+
+        private FlowRule findFlowById(String appIdText, String flowId) {
+            FlowRuleService fs = get(FlowRuleService.class);
+            int appIdInt = Integer.parseInt(appIdText);
+            ApplicationId appId = new DefaultApplicationId(appIdInt, "details");
+            Iterable<FlowRule> flows = fs.getFlowRulesById(appId);
+
+            for (FlowRule flow : flows) {
+                if (flow.id().toString().equals(flowId)) {
+                    return flow;
+                }
+            }
+
+            return null;
+        }
+
+        @Override
+        public void process(long sid, ObjectNode payload) {
+
+            String flowId = string(payload, FLOW_ID);
+            String appId = string(payload, APP_ID);
+            FlowRule flow = findFlowById(appId, flowId);
+            ObjectNode data = objectNode();
+
+            data.put(FLOW_ID, flow.id().toString());
+            data.put(FLOW_PRIORITY, flow.priority());
+
+            //TODO put more detail info to data
+
+            ObjectNode rootNode = objectNode();
+            rootNode.set(DETAILS, data);
+            sendMessage(FLOW_DETAILS_RESP, rootNode);
+        }
+    }
 }