Remove deprecated tunnel APIs

Change-Id: Ibf8005ba433f726536303750e8db65dcbd3c6aa6
This commit is contained in:
Ray Milkey 2018-09-21 10:14:51 -07:00 committed by Thomas Vachuska
parent 42e7b86fa7
commit a8f108ff24
2 changed files with 0 additions and 38 deletions

View File

@ -15,8 +15,6 @@
*/
package org.onosproject.incubator.net.virtual.provider;
import org.onosproject.incubator.net.tunnel.TunnelId;
import org.onosproject.incubator.net.virtual.NetworkId;
import org.onosproject.net.ConnectPoint;
import org.onosproject.net.provider.Provider;
@ -37,28 +35,4 @@ public interface VirtualNetworkProvider extends Provider {
boolean isTraversable(ConnectPoint src, ConnectPoint dst);
// TODO: Further enhance this interface to support the virtual intent programming across this boundary.
/**
* Creates a network tunnel for all traffic from the specified source
* connection point to the indicated destination connection point.
*
* @param networkId virtual network identifier
* @param src source connection point
* @param dst destination connection point
* @return new tunnel's id
* @deprecated in Loon Release (1.11)
*/
@Deprecated
TunnelId createTunnel(NetworkId networkId, ConnectPoint src, ConnectPoint dst);
/**
* Destroys the specified network tunnel.
*
* @param networkId virtual network identifier
* @param tunnelId tunnel identifier
* @deprecated in Loon Release (1.11)
*/
@Deprecated
void destroyTunnel(NetworkId networkId, TunnelId tunnelId);
}

View File

@ -22,9 +22,7 @@ import org.apache.felix.scr.annotations.Deactivate;
import org.apache.felix.scr.annotations.Reference;
import org.apache.felix.scr.annotations.ReferenceCardinality;
import org.apache.felix.scr.annotations.Service;
import org.onosproject.incubator.net.tunnel.TunnelId;
import org.onosproject.incubator.net.virtual.DefaultVirtualLink;
import org.onosproject.incubator.net.virtual.NetworkId;
import org.onosproject.incubator.net.virtual.provider.VirtualNetworkProvider;
import org.onosproject.incubator.net.virtual.provider.VirtualNetworkProviderRegistry;
import org.onosproject.incubator.net.virtual.provider.VirtualNetworkProviderService;
@ -121,16 +119,6 @@ public class DefaultVirtualNetworkProvider
return foundSrc[0] && foundDst[0];
}
@Override
public TunnelId createTunnel(NetworkId networkId, ConnectPoint src, ConnectPoint dst) {
return null;
}
@Override
public void destroyTunnel(NetworkId networkId, TunnelId tunnelId) {
}
/**
* Returns a set of set of interconnected connect points in the default topology.
* The inner set represents the interconnected connect points, and the outerset