홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
Charles Chan
Committed by Gerrit Code Review
f4838a77 1 parent 38879629

ONOS-3552 Do not return group information when a device is unavailable 

Change-Id: I84753bf95c47bbebb3156474c03c2860c51ecb4e
Inline Side-by-side
Showing 2 changed files with 22 additions and 7 deletions
......@@ -16,6 +16,7 @@
package org.onosproject.store.group.impl;
import com.google.common.collect.FluentIterable;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Iterables;
import com.google.common.collect.Sets;
......@@ -28,6 +29,7 @@ import org.apache.felix.scr.annotations.Service;
import org.onlab.util.KryoNamespace;
import org.onlab.util.NewConcurrentHashMap;
import org.onosproject.cluster.ClusterService;
import org.onosproject.cluster.NodeId;
import org.onosproject.core.DefaultGroupId;
import org.onosproject.core.GroupId;
import org.onosproject.mastership.MastershipService;
......@@ -63,6 +65,7 @@ import org.slf4j.Logger;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
......@@ -276,16 +279,22 @@ public class DistributedGroupStore
*/
@Override
public Iterable<Group> getGroups(DeviceId deviceId) {
// flatten and make iterator unmodifiable
return FluentIterable.from(getGroupStoreKeyMap().values())
.filter(input -> input.deviceId().equals(deviceId))
.transform(input -> input);
// Let ImmutableSet.copyOf do the type conversion
return ImmutableSet.copyOf(getStoredGroups(deviceId));
}
private Iterable<StoredGroupEntry> getStoredGroups(DeviceId deviceId) {
// flatten and make iterator unmodifiable
return FluentIterable.from(getGroupStoreKeyMap().values())
.filter(input -> input.deviceId().equals(deviceId));
NodeId master = mastershipService.getMasterFor(deviceId);
if (master == null) {
log.debug("Failed to getGroups: No master for {}", deviceId);
return Collections.emptySet();
}
Set<StoredGroupEntry> storedGroups = getGroupStoreKeyMap().values()
.stream()
.filter(input -> input.deviceId().equals(deviceId))
.collect(Collectors.toSet());
return ImmutableSet.copyOf(storedGroups);
}
/**
......
......@@ -23,6 +23,7 @@ import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.onlab.junit.TestUtils;
import org.onosproject.cluster.NodeId;
import org.onosproject.core.DefaultGroupId;
import org.onosproject.core.GroupId;
import org.onosproject.mastership.MastershipServiceAdapter;
......@@ -106,6 +107,11 @@ public class DistributedGroupStoreTest {
public MastershipRole getLocalRole(DeviceId deviceId) {
return MastershipRole.MASTER;
}
@Override
public NodeId getMasterFor(DeviceId deviceId) {
return new NodeId("foo");
}
}
@Before
......