Remove deprecated Host Provider APIs
Change-Id: Ie6b2d2e38160a015df97337c06101e9156c8ab83
diff --git a/core/api/src/main/java/org/onosproject/net/host/HostLocationProbingService.java b/core/api/src/main/java/org/onosproject/net/host/HostLocationProbingService.java
deleted file mode 100644
index 66f1266..0000000
--- a/core/api/src/main/java/org/onosproject/net/host/HostLocationProbingService.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright 2018-present Open Networking Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.onosproject.net.host;
-
-import org.onosproject.net.ConnectPoint;
-import org.onosproject.net.Host;
-
-/**
- * Service for interacting with the host probing entities.
- *
- * @deprecated in ONOS 1.12, replaced by {@link HostProbingService}
- */
-@Deprecated
-public interface HostLocationProbingService {
- /**
- * Probes given host on given location.
- *
- * @param host the host to be probed
- * @param connectPoint the location of host to be probed
- * @param probeMode probe mode
- * @deprecated in ONOS 1.12, replaced by {@link HostProbingService#probeHost(Host, ConnectPoint, ProbeMode)}
- */
- @Deprecated
- void probeHost(Host host, ConnectPoint connectPoint, ProbeMode probeMode);
-}
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 f3dc7ab..90e39c6 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
@@ -17,8 +17,6 @@
import org.apache.commons.lang3.NotImplementedException;
import org.onlab.packet.IpAddress;
-import org.onlab.packet.MacAddress;
-import org.onosproject.net.ConnectPoint;
import org.onosproject.net.HostId;
import org.onosproject.net.HostLocation;
import org.onosproject.net.provider.ProviderService;
@@ -70,28 +68,4 @@
* @param location location of host that vanished
*/
void removeLocationFromHost(HostId hostId, HostLocation location);
-
- /**
- * Notifies HostProviderService the beginning of pending host location verification and
- * retrieves the unique MAC address for the probe.
- *
- * @param hostId ID of the host
- * @param connectPoint the connect point that is under verification
- * @param probeMode probe mode
- * @return probeMac, the source MAC address ONOS uses to probe the host
- * @deprecated in ONOS 1.12, replaced by {@link HostProbingProviderService}
- */
- @Deprecated
- default MacAddress addPendingHostLocation(HostId hostId, ConnectPoint connectPoint, ProbeMode probeMode) {
- return MacAddress.NONE;
- }
-
- /**
- * Notifies HostProviderService the end of pending host location verification.
- *
- * @param probeMac the source MAC address ONOS uses to probe the host
- * @deprecated in ONOS 1.12, replaced by {@link HostProbingProviderService}
- */
- @Deprecated
- default void removePendingHostLocation(MacAddress probeMac) {}
}
diff --git a/core/net/src/main/java/org/onosproject/net/host/impl/HostProbingManager.java b/core/net/src/main/java/org/onosproject/net/host/impl/HostProbingManager.java
index 648e200..08ce42e 100644
--- a/core/net/src/main/java/org/onosproject/net/host/impl/HostProbingManager.java
+++ b/core/net/src/main/java/org/onosproject/net/host/impl/HostProbingManager.java
@@ -25,7 +25,6 @@
import org.onlab.packet.MacAddress;
import org.onosproject.net.ConnectPoint;
import org.onosproject.net.Host;
-import org.onosproject.net.host.HostLocationProbingService;
import org.onosproject.net.host.HostProbingEvent;
import org.onosproject.net.host.ProbeMode;
import org.onosproject.net.host.HostProbingListener;
@@ -46,7 +45,7 @@
public class HostProbingManager extends
AbstractListenerProviderRegistry<HostProbingEvent, HostProbingListener, HostProbingProvider,
HostProbingProviderService>
- implements HostProbingService, HostProbingProviderRegistry, HostLocationProbingService {
+ implements HostProbingService, HostProbingProviderRegistry {
private final Logger log = getLogger(getClass());
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)