홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
Charles Chan
Committed by Gerrit Code Review
8b0fdaaf 1 parent 739873bf

HostLocationProvider should not remove hosts installed by other providers 

Change-Id: I0d95a3c9409a9d8bb4e0c0039ea24dc9c0efc45f
Inline Side-by-side
Showing 2 changed files with 8 additions and 3 deletions
......@@ -462,7 +462,9 @@ public class HostLocationProvider extends AbstractProvider implements HostProvid
// Signals host vanish for all specified hosts.
private void removeHosts(Set<Host> hosts) {
for (Host host : hosts) {
providerService.hostVanished(host.id());
if (host.providerId().equals(HostLocationProvider.this.id())) {
providerService.hostVanished(host.id());
}
}
}
......
......@@ -86,6 +86,9 @@ import static org.onosproject.net.PortNumber.portNumber;
import static org.onosproject.net.device.DeviceEvent.Type.*;
public class HostLocationProviderTest {
private static final ProviderId PROVIDER_ID =
new ProviderId("of", "org.onosproject.provider.host");
private static final Integer INPORT = 10;
private static final String DEV1 = "of:1";
private static final String DEV2 = "of:2";
......@@ -105,7 +108,7 @@ public class HostLocationProviderTest {
private static final HostLocation LOCATION =
new HostLocation(deviceId(DEV1), portNumber(INPORT), 0L);
private static final DefaultHost HOST =
new DefaultHost(ProviderId.NONE, hostId(MAC), MAC,
new DefaultHost(PROVIDER_ID, hostId(MAC), MAC,
vlanId(VlanId.UNTAGGED), LOCATION,
ImmutableSet.of(IP_ADDRESS));
......@@ -118,7 +121,7 @@ public class HostLocationProviderTest {
private static final HostLocation LOCATION2 =
new HostLocation(deviceId(DEV4), portNumber(INPORT), 0L);
private static final DefaultHost HOST2 =
new DefaultHost(ProviderId.NONE, hostId(MAC2), MAC2,
new DefaultHost(PROVIDER_ID, hostId(MAC2), MAC2,
vlanId(VlanId.UNTAGGED), LOCATION2,
ImmutableSet.of(IP_ADDRESS2));
......