ONOS-1791 : Populates MPLS rules also at edge routers

 - Adds check for mastership when updating group description.

Change-Id: I536bcec595b8727689de11eb41e4b2f86cabb936

@@ -124,9 +124,12 @@ public class DefaultRoutingHandler {
         synchronized (populationStatus) {
         synchronized (populationStatus) {
 
 
             if (populationStatus == Status.STARTED) {
             if (populationStatus == Status.STARTED) {
+                log.warn("Previous rule population is not finished.");
                 return true;
                 return true;
             }
             }
 
 
+            log.info("Starts rule population from link change");
+
             Set<ArrayList<DeviceId>> routeChanges;
             Set<ArrayList<DeviceId>> routeChanges;
             populationStatus = Status.STARTED;
             populationStatus = Status.STARTED;
             if (linkFail == null) {
             if (linkFail == null) {
@@ -138,7 +141,7 @@ public class DefaultRoutingHandler {
             }
             }
 
 
             if (routeChanges.isEmpty()) {
             if (routeChanges.isEmpty()) {
-                log.debug("No route changes for the link status change");
+                log.info("No route changes for the link status change");
                 populationStatus = Status.SUCCEEDED;
                 populationStatus = Status.SUCCEEDED;
                 return true;
                 return true;
             }
             }
@@ -164,6 +167,9 @@ public class DefaultRoutingHandler {
                 ECMPShortestPathGraph ecmpSpg = new ECMPShortestPathGraph(link.get(0), srManager);
                 ECMPShortestPathGraph ecmpSpg = new ECMPShortestPathGraph(link.get(0), srManager);
                 if (populateEcmpRoutingRules(link.get(0), ecmpSpg)) {
                 if (populateEcmpRoutingRules(link.get(0), ecmpSpg)) {
                     currentEcmpSpgMap.put(link.get(0), ecmpSpg);
                     currentEcmpSpgMap.put(link.get(0), ecmpSpg);
+                } else {
+                    log.warn("Failed to populate the flow ruls from {} to all", link.get(0));
+                    return false;
                 }
                 }
                 continue;
                 continue;
             }
             }
@@ -358,8 +364,7 @@ public class DefaultRoutingHandler {
         }
         }
 
 
         // If both target switch and dest switch are edge routers, then set IP
         // If both target switch and dest switch are edge routers, then set IP
-        // rule
-        // for both subnet and router IP.
+        // rule for both subnet and router IP.
         if (config.isEdgeDevice(targetSw) && config.isEdgeDevice(destSw)) {
         if (config.isEdgeDevice(targetSw) && config.isEdgeDevice(destSw)) {
             List<Ip4Prefix> subnets = config.getSubnets(destSw);
             List<Ip4Prefix> subnets = config.getSubnets(destSw);
             result = rulePopulator.populateIpRuleForSubnet(targetSw,
             result = rulePopulator.populateIpRuleForSubnet(targetSw,
@@ -377,7 +382,7 @@ public class DefaultRoutingHandler {
                 return false;
                 return false;
             }
             }
 
 
-        // TODO: If the target switch is an edge router, then set IP rules for the router IP.
+        // If the target switch is an edge router, then set IP rules for the router IP.
         } else if (config.isEdgeDevice(targetSw)) {
         } else if (config.isEdgeDevice(targetSw)) {
             Ip4Address routerIp = config.getRouterIp(destSw);
             Ip4Address routerIp = config.getRouterIp(destSw);
             IpPrefix routerIpPrefix = IpPrefix.valueOf(routerIp, IpPrefix.MAX_INET_MASK_LENGTH);
             IpPrefix routerIpPrefix = IpPrefix.valueOf(routerIp, IpPrefix.MAX_INET_MASK_LENGTH);
@@ -385,13 +390,12 @@ public class DefaultRoutingHandler {
             if (!result) {
             if (!result) {
                 return false;
                 return false;
             }
             }
+        }
 
 
-        // TODO: If the target switch is an transit router, then set MPLS rules only.
-        } else if (!config.isEdgeDevice(targetSw)) {
-            result = rulePopulator.populateMplsRule(targetSw, destSw, nextHops);
-            if (!result) {
-                return false;
-            }
+        // Populates MPLS rules to all routers
+        result = rulePopulator.populateMplsRule(targetSw, destSw, nextHops);
+        if (!result) {
+            return false;
         }
         }
 
 
         return true;
         return true;

@@ -463,8 +463,8 @@ public class DistributedGroupStore
                                        GroupBuckets newBuckets,
                                        GroupBuckets newBuckets,
                                        GroupKey newAppCookie) {
                                        GroupKey newAppCookie) {
         // Check if group update to be done by a remote instance
         // Check if group update to be done by a remote instance
-        if (mastershipService.
-                getLocalRole(deviceId) != MastershipRole.MASTER) {
+        if (mastershipService.getMasterFor(deviceId) != null &&
+                mastershipService.getLocalRole(deviceId) != MastershipRole.MASTER) {
             GroupStoreMessage groupOp = GroupStoreMessage.
             GroupStoreMessage groupOp = GroupStoreMessage.
                     createGroupUpdateRequestMsg(deviceId,
                     createGroupUpdateRequestMsg(deviceId,
                                                 oldAppCookie,
                                                 oldAppCookie,