commit dd7e3d5fc83c204c4500c43d6270b12c2cdcca76
author Jonathan Hart <jono@onlab.us> Thu Feb 18 15:56:22 2016 -0800
committer Gerrit Code Review <gerrit@onlab.us> Fri Feb 19 03:48:50 2016 +0000
tree e66e856ba9527f2e07dc278e70a1bff71f973be5
parent 4b312a30e5a9f5e6201e3d41bda4f022eb1c56be

It helps to get IGMP join and leaves the right way round

Change-Id: I7ada6835fa56aefaa421610ae8a303f2751be2b3

apps/cordmcast/src/main/java/org/onosproject/cordmcast/CordMcast.java

diff --git a/apps/cordmcast/src/main/java/org/onosproject/cordmcast/CordMcast.java b/apps/cordmcast/src/main/java/org/onosproject/cordmcast/CordMcast.java
index 2b140a8..86cd367 100644
--- a/apps/cordmcast/src/main/java/org/onosproject/cordmcast/CordMcast.java
+++ b/apps/cordmcast/src/main/java/org/onosproject/cordmcast/CordMcast.java
@@ -214,6 +214,10 @@
     }
 
     private void unprovisionGroup(McastRouteInfo info) {
+        if (info.sinks().isEmpty()) {
+            removeSyncedRoute(info);
+        }
+
         if (!info.sink().isPresent()) {
             log.warn("No sink given after sink removed event: {}", info);
             return;
@@ -242,8 +246,6 @@
                 });
 
         flowObjectiveService.next(loc.deviceId(), next);
-
-
     }
 
     private void provisionGroup(McastRouteInfo info) {
@@ -364,6 +366,21 @@
         builder.post(json.toString());
     }
 
+    private void removeSyncedRoute(McastRouteInfo info) {
+        if (syncHost == null) {
+            log.warn("No host configured for synchronization; route will be dropped");
+            return;
+        }
+
+        log.debug("Removing route from other ONOS: {}", info.route());
+
+        WebResource.Builder builder = getClientBuilder(fabricOnosUrl);
+
+        ObjectNode json = codecService.getCodec(McastRoute.class)
+                .encode(info.route(), new AbstractWebResource());
+        builder.delete(json.toString());
+    }
+
     private Integer allocateId() {
         return channels.getAndIncrement();
     }

apps/igmp/src/main/java/org/onosproject/igmp/IgmpSnoop.java

diff --git a/apps/igmp/src/main/java/org/onosproject/igmp/IgmpSnoop.java b/apps/igmp/src/main/java/org/onosproject/igmp/IgmpSnoop.java
index 2cec57b..03f561b 100644
--- a/apps/igmp/src/main/java/org/onosproject/igmp/IgmpSnoop.java
+++ b/apps/igmp/src/main/java/org/onosproject/igmp/IgmpSnoop.java
@@ -275,9 +275,10 @@
             IGMPMembership membership = (IGMPMembership) group;
 
             // TODO allow pulling source from IGMP packet
-            IpAddress source = IpAddress.valueOf("0.0.0.0");
-            if (ssmTranslateTable.containsKey(group.getGaddr())) {
-                source = ssmTranslateTable.get(group.getGaddr());
+            IpAddress source = ssmTranslateTable.get(group.getGaddr());
+            if (source == null) {
+                log.warn("No source found in SSM translate table for {}", group.getGaddr());
+                return;
             }
 
             McastRoute route = new McastRoute(source,
@@ -287,14 +288,13 @@
             if (membership.getRecordType() == IGMPMembership.MODE_IS_INCLUDE ||
                     membership.getRecordType() == IGMPMembership.CHANGE_TO_INCLUDE_MODE) {
 
+                multicastService.removeSink(route, location);
+                // TODO remove route if all sinks are gone
+            } else if (membership.getRecordType() == IGMPMembership.MODE_IS_EXCLUDE ||
+                    membership.getRecordType() == IGMPMembership.CHANGE_TO_EXCLUDE_MODE) {
 
                 multicastService.add(route);
                 multicastService.addSink(route, location);
-
-            } else if (membership.getRecordType() == IGMPMembership.MODE_IS_EXCLUDE ||
-                    membership.getRecordType() == IGMPMembership.CHANGE_TO_EXCLUDE_MODE) {
-                multicastService.removeSink(route, location);
-                // TODO remove route if all sinks are gone
             }
 
         });