Ray Milkey

Remove methods deprecated in Drake from TunnelConfig API

Change-Id: I2777fa231ae9b780b6fdc29f58d2fcdef818c32c
......@@ -25,15 +25,6 @@ import org.onosproject.net.driver.HandlerBehaviour;
public interface TunnelConfig extends HandlerBehaviour {
/**
* Creates a tunnel on this device.
*
* @param tunnel tunnel descriptor
* @deprecated 1.3.0 Drake Release
*/
@Deprecated
void createTunnel(TunnelDescription tunnel);
/**
* Creates a tunnel interface on a given bridge of this device.
*
* @param bridgeName bridge name
......
......@@ -48,24 +48,6 @@ public class OvsdbTunnelConfig extends AbstractHandlerBehaviour
private static final String OPTION_REMOTE_IP = "remote_ip";
@Override
public void createTunnel(TunnelDescription tunnel) {
DriverHandler handler = handler();
OvsdbClientService ovsdbNode = getOvsdbNode(handler);
IpTunnelEndPoint ipSrc = IpTunnelEndPoint.ipTunnelPoint(IpAddress
.valueOf(DEFAULT_ADDRESS));
IpTunnelEndPoint ipDst = IpTunnelEndPoint.ipTunnelPoint(IpAddress
.valueOf(DEFAULT_ADDRESS));
if (tunnel.src() instanceof IpTunnelEndPoint) {
ipSrc = (IpTunnelEndPoint) tunnel.src();
}
if (tunnel.dst() instanceof IpTunnelEndPoint) {
ipDst = (IpTunnelEndPoint) tunnel.dst();
}
//Even if source point ip or destination point ip equals 0:0:0:0, it is still work-in-progress.
ovsdbNode.createTunnel(ipSrc.ip(), ipDst.ip());
}
@Override
public boolean createTunnelInterface(BridgeName bridgeName, TunnelDescription tunnel) {
Map<String, String> options = ((DefaultAnnotations) tunnel.annotations()).asMap();
if (tunnel.src() != null) {
......