commit 2404fec22d206a4bdecc2fc9fb1db3c88925749c
author Sangho Shin <sangho@onlab.us> Wed Oct 29 10:43:05 2014 -0700
committer Sangho Shin <sangho@onlab.us> Wed Oct 29 10:44:22 2014 -0700
tree 99ab51113cc1579b4e2385eb3253b0059d23049a
parent ad22349536b489a370bba1edda82d0cc5acd0213

Quick fix not to call createGroup() multiple time for the same ports when populating adjacencySid rule in MPLS table

Change-Id: I1a403178f83e6847c328d1af1a2dbe5ea39f7621

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 d6b9a0d..6039d60 100644
--- a/src/main/java/net/onrc/onos/apps/segmentrouting/SegmentRoutingManager.java
+++ b/src/main/java/net/onrc/onos/apps/segmentrouting/SegmentRoutingManager.java
@@ -119,6 +119,8 @@
     private HashMap<String, SegmentRoutingPolicy> policyTable;
     private HashMap<String, SegmentRoutingTunnel> tunnelTable;
     private HashMap<Integer, HashMap<Integer, List<Integer>>> adjacencySidTable;
+    private HashMap<Integer, Integer> adjcencyGroupIdTable;
+
 
     // Flag whether transit router supports ECMP or not
     // private boolean supportTransitECMP = true;
@@ -195,6 +197,7 @@
         policyTable = new HashMap<String, SegmentRoutingPolicy>();
         tunnelTable = new HashMap<String, SegmentRoutingTunnel>();
         adjacencySidTable = new HashMap<Integer,HashMap<Integer, List<Integer>>>();
+        adjcencyGroupIdTable = new HashMap<Integer, Integer>();
 
         packetService.registerPacketListener(this);
         topologyService.addListener(this, false);
@@ -644,16 +647,27 @@
         IOF13Switch sw13 = (IOF13Switch) floodlightProvider.getMasterSwitch(
                 getSwId(sw.getDpid().toString()));
 
-        int groupId = -1;
+        Integer groupId = -1;
         if (sw13 != null) {
             List<PortNumber> portList = new ArrayList<PortNumber>();
-            for (Integer port: ports)
-                portList.add(PortNumber.uint32(port));
-            groupId = sw13.createGroup(new ArrayList<Integer>(), portList);
-        }
-
-        if (groupId < 0) {
-            log.debug("Failed to create a group at driver for adj ID {}", adjId);
+            int key = 0;
+            for (Integer port: ports) {
+                PortNumber portNumber = PortNumber.uint32(port);
+                portList.add(portNumber);
+                key += portNumber.hashCode();
+            }
+            key += sw.getDpid().hashCode();
+            groupId = adjcencyGroupIdTable.get(key);
+            if (groupId == null) {
+                groupId = sw13.createGroup(new ArrayList<Integer>(), portList);
+                if (groupId < 0) {
+                    log.debug("Failed to create a group at driver for adj ID {}", adjId);
+                    return;
+                }
+                else {
+                    adjcencyGroupIdTable.put(key, groupId);
+                }
+            }
         }
 
         pushAdjRule(sw, adjId, null, null, groupId, true);
@@ -1362,7 +1376,7 @@
     private HashMap<Integer, List<Integer>> parseAdjacencySidInfo(String adjInfo)
             throws JSONException {
         JSONArray arry = new JSONArray(adjInfo);
-        HashMap<Integer, List<Integer>> AdjacencyInfo =
+        HashMap<Integer, List<Integer>> adjacencyInfo =
                 new HashMap<Integer, List<Integer>>();
 
         for (int i = 0; i < arry.length(); i++) {
@@ -1375,9 +1389,9 @@
             for (int j = 0; j < portNos.length(); j++) {
                 portNoList.add(Integer.valueOf(portNos.getInt(j)));
             }
-            AdjacencyInfo.put(adjId, portNoList);
+            adjacencyInfo.put(adjId, portNoList);
         }
-        return AdjacencyInfo;
+        return adjacencyInfo;
     }
 
     /**