홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
Ray Milkey
f1f58866 1 parent 3a9911c9

Remove methods deprecated in Drake from TunnelConfig API 

Change-Id: I2777fa231ae9b780b6fdc29f58d2fcdef818c32c
Inline Side-by-side
Showing 2 changed files with 0 additions and 27 deletions
...@@ -25,15 +25,6 @@ import org.onosproject.net.driver.HandlerBehaviour; ...@@ -25,15 +25,6 @@ import org.onosproject.net.driver.HandlerBehaviour;
25 public interface TunnelConfig extends HandlerBehaviour { 25 public interface TunnelConfig extends HandlerBehaviour {
26 26
27 /** 27 /**
28 - * Creates a tunnel on this device.
29 - *
30 - * @param tunnel tunnel descriptor
31 - * @deprecated 1.3.0 Drake Release
32 - */
33 - @Deprecated
34 - void createTunnel(TunnelDescription tunnel);
35 -
36 - /**
37 * Creates a tunnel interface on a given bridge of this device. 28 * Creates a tunnel interface on a given bridge of this device.
38 * 29 *
39 * @param bridgeName bridge name 30 * @param bridgeName bridge name
......
...@@ -48,24 +48,6 @@ public class OvsdbTunnelConfig extends AbstractHandlerBehaviour ...@@ -48,24 +48,6 @@ public class OvsdbTunnelConfig extends AbstractHandlerBehaviour
48 private static final String OPTION_REMOTE_IP = "remote_ip"; 48 private static final String OPTION_REMOTE_IP = "remote_ip";
49 49
50 @Override 50 @Override
51 - public void createTunnel(TunnelDescription tunnel) {
52 - DriverHandler handler = handler();
53 - OvsdbClientService ovsdbNode = getOvsdbNode(handler);
54 - IpTunnelEndPoint ipSrc = IpTunnelEndPoint.ipTunnelPoint(IpAddress
55 - .valueOf(DEFAULT_ADDRESS));
56 - IpTunnelEndPoint ipDst = IpTunnelEndPoint.ipTunnelPoint(IpAddress
57 - .valueOf(DEFAULT_ADDRESS));
58 - if (tunnel.src() instanceof IpTunnelEndPoint) {
59 - ipSrc = (IpTunnelEndPoint) tunnel.src();
60 - }
61 - if (tunnel.dst() instanceof IpTunnelEndPoint) {
62 - ipDst = (IpTunnelEndPoint) tunnel.dst();
63 - }
64 - //Even if source point ip or destination point ip equals 0:0:0:0, it is still work-in-progress.
65 - ovsdbNode.createTunnel(ipSrc.ip(), ipDst.ip());
66 - }
67 -
68 - @Override
69 public boolean createTunnelInterface(BridgeName bridgeName, TunnelDescription tunnel) { 51 public boolean createTunnelInterface(BridgeName bridgeName, TunnelDescription tunnel) {
70 Map<String, String> options = ((DefaultAnnotations) tunnel.annotations()).asMap(); 52 Map<String, String> options = ((DefaultAnnotations) tunnel.annotations()).asMap();
71 if (tunnel.src() != null) { 53 if (tunnel.src() != null) {
......