remove hostDetected() method that was deprecated in Drake
Change-Id: Ib975d7c8f5cf8aec25a1990114ad516e2d273150
diff --git a/apps/dhcp/app/src/main/java/org/onosproject/dhcp/impl/DhcpManager.java b/apps/dhcp/app/src/main/java/org/onosproject/dhcp/impl/DhcpManager.java
index 572fb15..3c6573a 100644
--- a/apps/dhcp/app/src/main/java/org/onosproject/dhcp/impl/DhcpManager.java
+++ b/apps/dhcp/app/src/main/java/org/onosproject/dhcp/impl/DhcpManager.java
@@ -585,7 +585,7 @@
HostId hostId = HostId.hostId(mac, vlanId);
DefaultHostDescription desc = new DefaultHostDescription(mac, vlanId, hostLocation, ips);
- hostProviderService.hostDetected(hostId, desc);
+ hostProviderService.hostDetected(hostId, desc, false);
}
diff --git a/core/api/src/main/java/org/onosproject/net/host/HostProviderService.java b/core/api/src/main/java/org/onosproject/net/host/HostProviderService.java
index 3403486..f22b044 100644
--- a/core/api/src/main/java/org/onosproject/net/host/HostProviderService.java
+++ b/core/api/src/main/java/org/onosproject/net/host/HostProviderService.java
@@ -30,19 +30,6 @@
*
* @param hostId id of the host that been detected
* @param hostDescription description of host and its location
- * @deprecated in Drake release
- */
- @Deprecated
- default void hostDetected(HostId hostId, HostDescription hostDescription) {
- hostDetected(hostId, hostDescription, false);
- }
-
- /**
- * Notifies the core when a host has been detected on a network along with
- * information that identifies the host location.
- *
- * @param hostId id of the host that been detected
- * @param hostDescription description of host and its location
* @param replaceIps replace IP set if true, merge IP set otherwise
*/
void hostDetected(HostId hostId, HostDescription hostDescription, boolean replaceIps);
diff --git a/core/net/src/test/java/org/onosproject/net/host/impl/HostManagerTest.java b/core/net/src/test/java/org/onosproject/net/host/impl/HostManagerTest.java
index c5a6cab..56e7ce8 100644
--- a/core/net/src/test/java/org/onosproject/net/host/impl/HostManagerTest.java
+++ b/core/net/src/test/java/org/onosproject/net/host/impl/HostManagerTest.java
@@ -125,7 +125,7 @@
private void detect(HostId hid, MacAddress mac, VlanId vlan,
HostLocation loc, IpAddress ip) {
HostDescription descr = new DefaultHostDescription(mac, vlan, loc, ip);
- providerService.hostDetected(hid, descr);
+ providerService.hostDetected(hid, descr, false);
assertNotNull("host should be found", mgr.getHost(hid));
}
diff --git a/providers/host/src/main/java/org/onosproject/provider/host/impl/HostLocationProvider.java b/providers/host/src/main/java/org/onosproject/provider/host/impl/HostLocationProvider.java
index ebc0da2..caa7f82 100644
--- a/providers/host/src/main/java/org/onosproject/provider/host/impl/HostLocationProvider.java
+++ b/providers/host/src/main/java/org/onosproject/provider/host/impl/HostLocationProvider.java
@@ -297,7 +297,7 @@
VlanId vlan, HostLocation hloc) {
HostDescription desc = new DefaultHostDescription(mac, vlan, hloc);
try {
- providerService.hostDetected(hid, desc);
+ providerService.hostDetected(hid, desc, false);
} catch (IllegalStateException e) {
log.debug("Host {} suppressed", hid);
}
@@ -319,7 +319,7 @@
new DefaultHostDescription(mac, vlan, hloc) :
new DefaultHostDescription(mac, vlan, hloc, ip);
try {
- providerService.hostDetected(hid, desc);
+ providerService.hostDetected(hid, desc, false);
} catch (IllegalStateException e) {
log.debug("Host {} suppressed", hid);
}
diff --git a/providers/null/src/main/java/org/onosproject/provider/nil/ConfiguredTopologySimulator.java b/providers/null/src/main/java/org/onosproject/provider/nil/ConfiguredTopologySimulator.java
index ad57bf3..56e61aa 100644
--- a/providers/null/src/main/java/org/onosproject/provider/nil/ConfiguredTopologySimulator.java
+++ b/providers/null/src/main/java/org/onosproject/provider/nil/ConfiguredTopologySimulator.java
@@ -39,6 +39,6 @@
protected void createHosts() {
hostService.getHosts()
.forEach(host -> hostProviderService
- .hostDetected(host.id(), description(host)));
+ .hostDetected(host.id(), description(host), false));
}
}
diff --git a/providers/null/src/main/java/org/onosproject/provider/nil/TopologySimulator.java b/providers/null/src/main/java/org/onosproject/provider/nil/TopologySimulator.java
index 9f2320e..a00456e 100644
--- a/providers/null/src/main/java/org/onosproject/provider/nil/TopologySimulator.java
+++ b/providers/null/src/main/java/org/onosproject/provider/nil/TopologySimulator.java
@@ -231,7 +231,7 @@
ipBytes[3] = (byte) (i + 1);
HostId id = hostId(MacAddress.valueOf(macBytes), VlanId.NONE);
IpAddress ip = IpAddress.valueOf(IpAddress.Version.INET, ipBytes);
- hostProviderService.hostDetected(id, description(id, ip, deviceId, port));
+ hostProviderService.hostDetected(id, description(id, ip, deviceId, port), false);
}
}
@@ -379,4 +379,4 @@
}
}
}
-}
\ No newline at end of file
+}
diff --git a/providers/ovsdb/host/src/main/java/org/onosproject/ovsdb/provider/host/OvsdbHostProvider.java b/providers/ovsdb/host/src/main/java/org/onosproject/ovsdb/provider/host/OvsdbHostProvider.java
index 031fda7..c299d64 100644
--- a/providers/ovsdb/host/src/main/java/org/onosproject/ovsdb/provider/host/OvsdbHostProvider.java
+++ b/providers/ovsdb/host/src/main/java/org/onosproject/ovsdb/provider/host/OvsdbHostProvider.java
@@ -124,7 +124,7 @@
VlanId.vlanId(),
loaction,
annotations);
- providerService.hostDetected(hostId, hostDescription);
+ providerService.hostDetected(hostId, hostDescription, false);
break;
case PORT_REMOVED:
HostId host = HostId.hostId(subject.hwAddress(), VlanId.vlanId());
diff --git a/web/api/src/main/java/org/onosproject/rest/resources/ConfigProvider.java b/web/api/src/main/java/org/onosproject/rest/resources/ConfigProvider.java
index 2775c2e..005341e 100644
--- a/web/api/src/main/java/org/onosproject/rest/resources/ConfigProvider.java
+++ b/web/api/src/main/java/org/onosproject/rest/resources/ConfigProvider.java
@@ -439,7 +439,7 @@
DefaultHostDescription desc =
new DefaultHostDescription(mac, vlanId, location, ips, annotations);
- hostProviderService.hostDetected(hostId, desc);
+ hostProviderService.hostDetected(hostId, desc, false);
connectPoints.add(location);
}
diff --git a/web/api/src/main/java/org/onosproject/rest/resources/HostsWebResource.java b/web/api/src/main/java/org/onosproject/rest/resources/HostsWebResource.java
index 8f69c24..809cd24 100644
--- a/web/api/src/main/java/org/onosproject/rest/resources/HostsWebResource.java
+++ b/web/api/src/main/java/org/onosproject/rest/resources/HostsWebResource.java
@@ -209,7 +209,7 @@
HostId hostId = HostId.hostId(mac, vlanId);
DefaultHostDescription desc = new DefaultHostDescription(mac, vlanId, hostLocation, ips, annotations);
- hostProviderService.hostDetected(hostId, desc);
+ hostProviderService.hostDetected(hostId, desc, false);
return hostId;
}
diff --git a/web/api/src/test/java/org/onosproject/rest/HostResourceTest.java b/web/api/src/test/java/org/onosproject/rest/HostResourceTest.java
index 472ed0f..4221846 100644
--- a/web/api/src/test/java/org/onosproject/rest/HostResourceTest.java
+++ b/web/api/src/test/java/org/onosproject/rest/HostResourceTest.java
@@ -365,7 +365,7 @@
*/
@Test
public void testPost() {
- mockHostProviderService.hostDetected(anyObject(), anyObject());
+ mockHostProviderService.hostDetected(anyObject(), anyObject(), anyBoolean());
expectLastCall();
replay(mockHostProviderService);