diff --git a/apps/routing-api/src/main/java/org/onosproject/routing/config/RoutingConfigurationService.java b/apps/routing-api/src/main/java/org/onosproject/routing/config/RoutingConfigurationService.java index f8ee21b9cf..45316bd57e 100644 --- a/apps/routing-api/src/main/java/org/onosproject/routing/config/RoutingConfigurationService.java +++ b/apps/routing-api/src/main/java/org/onosproject/routing/config/RoutingConfigurationService.java @@ -73,15 +73,6 @@ public interface RoutingConfigurationService { */ boolean isIpPrefixLocal(IpPrefix ipPrefix); - /** - * Retrieves the entire set of interfaces in the network. - * - * @return the set of interfaces - * @deprecated in Drake release - use InterfaceService instead - */ - @Deprecated - Set getInterfaces(); - /** * Retrieves the entire set of connect points connected to BGP peers in the * network. @@ -90,27 +81,6 @@ public interface RoutingConfigurationService { */ Set getBgpPeerConnectPoints(); - /** - * Retrieves the interface associated with the given connect point. - * - * @param connectPoint the connect point to retrieve interface information - * for - * @return the interface - * @deprecated in Drake release - use InterfaceService instead - */ - @Deprecated - Interface getInterface(ConnectPoint connectPoint); - - /** - * Retrieves the interface associated with the given IP address. - * - * @param ip IP address of the interface - * @return the interface - * @deprecated in Drake release - use InterfaceService instead - */ - @Deprecated - Interface getInterface(IpAddress ip); - /** * Retrieves the interface that matches the given IP address. Matching * means that the IP address is in one of the interface's assigned subnets. diff --git a/apps/routing/src/main/java/org/onosproject/routing/config/impl/RoutingConfigurationImpl.java b/apps/routing/src/main/java/org/onosproject/routing/config/impl/RoutingConfigurationImpl.java index 3fea426cd3..0917d755e4 100644 --- a/apps/routing/src/main/java/org/onosproject/routing/config/impl/RoutingConfigurationImpl.java +++ b/apps/routing/src/main/java/org/onosproject/routing/config/impl/RoutingConfigurationImpl.java @@ -195,11 +195,6 @@ public class RoutingConfigurationImpl implements RoutingConfigurationService { return Collections.unmodifiableMap(bgpPeers); } - @Override - public Set getInterfaces() { - return Collections.emptySet(); - } - @Override public Set getBgpPeerConnectPoints() { // TODO perhaps cache this result in future @@ -221,16 +216,6 @@ public class RoutingConfigurationImpl implements RoutingConfigurationService { } } - @Override - public Interface getInterface(ConnectPoint connectPoint) { - return null; - } - - @Override - public Interface getInterface(IpAddress ip) { - return null; - } - @Override public Interface getMatchingInterface(IpAddress ipAddress) { return null;