commit ced05b66485b583bfa9930b34c277853aca8850b
author Sangho Shin <sangho@onlab.us> Wed Oct 22 11:23:14 2014 -0700
committer Sangho Shin <sangho@onlab.us> Wed Oct 22 11:23:14 2014 -0700
tree 12cf9eb606d50771ded60a831bbd5658c2f6771e
parent 204b99714aae938265d7d974332461baf1ad64a8

Provide a public funtion to return adjacecy IDs for a router (with node Sid)

Change-Id: I3f602ded504dc8d57916d6e9581b67f33c2cb742

src/main/java/net/onrc/onos/apps/segmentrouting/SegmentRoutingManager.java

diff --git a/src/main/java/net/onrc/onos/apps/segmentrouting/SegmentRoutingManager.java b/src/main/java/net/onrc/onos/apps/segmentrouting/SegmentRoutingManager.java
index e825203..ebb805a 100644
--- a/src/main/java/net/onrc/onos/apps/segmentrouting/SegmentRoutingManager.java
+++ b/src/main/java/net/onrc/onos/apps/segmentrouting/SegmentRoutingManager.java
@@ -592,13 +592,33 @@
         String nodeSidStr = sw.getStringAttribute("nodeSid");
         String srcMac = sw.getStringAttribute("routerMac");
         String autoAdjInfo = sw.getStringAttribute("autogenAdjSids");
+        List<Integer> adjacecyIdList = new ArrayList<Integer>();
 
-        if (adjInfo == null || srcMac == null || nodeSidStr == null)
+        if (autoAdjInfo == null || srcMac == null || nodeSidStr == null)
             return;
 
-        JSONArray arry = new JSONArray(adjInfo);
+        // parse adjacency Id
+        if (adjInfo != null) {
+            JSONArray arry = new JSONArray(adjInfo);
+
+            for (int i = 0; i < arry.length(); i++) {
+                Integer adjId = (Integer) arry.getJSONObject(i).get("adjSid");
+                JSONArray portNos = (JSONArray) arry.getJSONObject(i).get("ports");
+                if (adjId == null || portNos == null)
+                    continue;
+
+                List<Integer> portNoList = new ArrayList<Integer>();
+                for (int j = 0; j < portNos.length(); j++) {
+                    portNoList.add(Integer.valueOf(portNos.getInt(0)));
+                }
+                adjacecyIdList.add(adjId);
+            }
+        }
+
+        // parse auto generated adjacecy Id
+
+        JSONArray arry = new JSONArray(autoAdjInfo);
         for (int i = 0; i < arry.length(); i++) {
-            //Object a = arry.getJSONObject(i);
             Integer adjId = (Integer) arry.getJSONObject(i).get("adjSid");
             JSONArray portNos = (JSONArray) arry.getJSONObject(i).get("ports");
             if (adjId == null || portNos == null)
@@ -608,8 +628,10 @@
             for (int j = 0; j < portNos.length(); j++) {
                 portNoList.add(Integer.valueOf(portNos.getInt(0)));
             }
+            adjacecyIdList.add(adjId);
+        }
 
-            adjacencyIdTable.put(Integer.parseInt(nodeSidStr), portNoList);
+        adjacencyIdTable.put(Integer.parseInt(nodeSidStr), adjacecyIdList);
 
             /*
             Dpid dstDpid = null;
@@ -636,7 +658,6 @@
             setAdjRule(sw, adjId, srcMac, dstMac, portNo, true); // BoS = 1
             setAdjRule(sw, adjId, srcMac, dstMac, portNo, false); // BoS = 0
             */
-        }
 
     }
 
@@ -1565,6 +1586,16 @@
     // ************************************
 
     /**
+     * Returns the Adjacency IDs for the node
+     *
+     * @param nodeSid Node SID
+     * @return List of Adjacency ID
+     */
+    public List<Integer> getAdjacencyIds(int nodeSid) {
+        return this.adjacencyIdTable.get(Integer.valueOf(nodeSid));
+    }
+
+    /**
      * Get the forwarding Switch DPIDs to send packets to a node
      *
      * @param srcSw source switch