Fixes to the IGMP app to process group membership reports
Change-Id: I7a478011caadb8250f6a25b5fb5a820485e593b6
diff --git a/incubator/store/src/main/java/org/onosproject/incubator/store/mcast/impl/DistributedMcastStore.java b/incubator/store/src/main/java/org/onosproject/incubator/store/mcast/impl/DistributedMcastStore.java
index 5af5266..331ecbb 100644
--- a/incubator/store/src/main/java/org/onosproject/incubator/store/mcast/impl/DistributedMcastStore.java
+++ b/incubator/store/src/main/java/org/onosproject/incubator/store/mcast/impl/DistributedMcastStore.java
@@ -54,13 +54,11 @@
mcastRib = storageService.<McastRoute, MulticastData>consistentMapBuilder()
.withName(MCASTRIB)
.withSerializer(Serializer.using(KryoNamespace.newBuilder()
- .register(KryoNamespaces.BASIC)
- .register(KryoNamespaces.MISC)
+ .register(KryoNamespaces.API)
.register(
MulticastData.class,
McastRoute.class,
- McastRoute.Type.class,
- ConnectPoint.class
+ McastRoute.Type.class
).build()))
//.withRelaxedReadConsistency()
.build();
diff --git a/incubator/store/src/main/java/org/onosproject/incubator/store/mcast/impl/MulticastData.java b/incubator/store/src/main/java/org/onosproject/incubator/store/mcast/impl/MulticastData.java
index 75b5206..11741b5 100644
--- a/incubator/store/src/main/java/org/onosproject/incubator/store/mcast/impl/MulticastData.java
+++ b/incubator/store/src/main/java/org/onosproject/incubator/store/mcast/impl/MulticastData.java
@@ -16,9 +16,9 @@
package org.onosproject.incubator.store.mcast.impl;
import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Sets;
import org.onosproject.net.ConnectPoint;
+import java.util.HashSet;
import java.util.Set;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicReference;
@@ -37,13 +37,16 @@
private final AtomicBoolean isEmpty = new AtomicBoolean();
private MulticastData() {
- this.sinks = Sets.newConcurrentHashSet();
+ // FIXME we have major problems trying to serialize these sets
+ //this.sinks = Sets.newConcurrentHashSet();
+ this.sinks = new HashSet<>();
isEmpty.set(true);
}
public MulticastData(ConnectPoint source) {
this.source.set(checkNotNull(source, "Multicast source cannot be null."));
- this.sinks = Sets.newConcurrentHashSet();
+ //this.sinks = Sets.newConcurrentHashSet();
+ this.sinks = new HashSet<>();
isEmpty.set(false);
}