Revert "Fixing Hosts filtered by RegionId... for topo-2 view."
This reverts commit 4aef6c371a5fd25171ef9ea8faf193d662c5544c.
Change-Id: Ib2959eb73686af2788525710e33f8fc8db78b819
diff --git a/core/net/src/main/java/org/onosproject/net/region/impl/RegionManager.java b/core/net/src/main/java/org/onosproject/net/region/impl/RegionManager.java
index b988021..75d96ed 100644
--- a/core/net/src/main/java/org/onosproject/net/region/impl/RegionManager.java
+++ b/core/net/src/main/java/org/onosproject/net/region/impl/RegionManager.java
@@ -25,9 +25,7 @@
import org.onosproject.cluster.NodeId;
import org.onosproject.event.AbstractListenerManager;
import org.onosproject.net.DeviceId;
-import org.onosproject.net.Host;
import org.onosproject.net.HostId;
-import org.onosproject.net.host.HostService;
import org.onosproject.net.region.Region;
import org.onosproject.net.region.RegionAdminService;
import org.onosproject.net.region.RegionEvent;
@@ -39,17 +37,15 @@
import org.slf4j.Logger;
import java.util.Collection;
-import java.util.HashSet;
import java.util.List;
import java.util.Set;
-import java.util.stream.Collectors;
import static com.google.common.base.Preconditions.checkNotNull;
import static com.google.common.base.Preconditions.checkState;
import static com.google.common.collect.ImmutableList.of;
+import static org.slf4j.LoggerFactory.getLogger;
import static org.onosproject.security.AppGuard.checkPermission;
import static org.onosproject.security.AppPermission.Type.REGION_READ;
-import static org.slf4j.LoggerFactory.getLogger;
/**
* Provides implementation of the region service APIs.
@@ -73,9 +69,6 @@
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
protected RegionStore store;
- @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
- protected HostService hostService;
-
@Activate
public void activate() {
store.setDelegate(delegate);
@@ -161,14 +154,7 @@
public Set<HostId> getRegionHosts(RegionId regionId) {
checkPermission(REGION_READ);
checkNotNull(regionId, REGION_ID_NULL);
- Set<DeviceId> devs = getRegionDevices(regionId);
- Set<HostId> hostIds = new HashSet<>();
- for (DeviceId d : devs) {
- Set<HostId> ids = hostService.getConnectedHosts(d).stream()
- .map(Host::id)
- .collect(Collectors.toSet());
- hostIds.addAll(ids);
- }
- return hostIds;
+ return store.getRegionHosts(regionId);
}
+
}
diff --git a/core/net/src/test/java/org/onosproject/net/region/impl/RegionManagerTest.java b/core/net/src/test/java/org/onosproject/net/region/impl/RegionManagerTest.java
index 73fba4d..fd15104 100644
--- a/core/net/src/test/java/org/onosproject/net/region/impl/RegionManagerTest.java
+++ b/core/net/src/test/java/org/onosproject/net/region/impl/RegionManagerTest.java
@@ -38,16 +38,9 @@
import java.util.List;
import java.util.Set;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-import static org.onosproject.net.region.Region.Type.CAMPUS;
-import static org.onosproject.net.region.Region.Type.COUNTRY;
-import static org.onosproject.net.region.Region.Type.METRO;
-import static org.onosproject.net.region.RegionEvent.Type.REGION_ADDED;
-import static org.onosproject.net.region.RegionEvent.Type.REGION_MEMBERSHIP_CHANGED;
-import static org.onosproject.net.region.RegionEvent.Type.REGION_REMOVED;
-import static org.onosproject.net.region.RegionEvent.Type.REGION_UPDATED;
+import static org.junit.Assert.*;
+import static org.onosproject.net.region.Region.Type.*;
+import static org.onosproject.net.region.RegionEvent.Type.*;
/**
* Tests of the region service implementation.
@@ -75,8 +68,6 @@
TestUtils.setField(store, "storageService", new TestStorageService());
store.activate();
- // possibly manager.hostService = new MockHostService();
-
manager.store = store;
manager.addListener(listener);
NetTestTools.injectEventDispatcher(manager, new TestEventDispatcher());