Remove deprecated APIs
Change-Id: Ie2434cc8cb4721a1ed132528f902bc8f6ed17d59
diff --git a/protocols/ovsdb/api/src/main/java/org/onosproject/ovsdb/controller/OvsdbClientService.java b/protocols/ovsdb/api/src/main/java/org/onosproject/ovsdb/controller/OvsdbClientService.java
index 8c11c3d..b81804a 100644
--- a/protocols/ovsdb/api/src/main/java/org/onosproject/ovsdb/controller/OvsdbClientService.java
+++ b/protocols/ovsdb/api/src/main/java/org/onosproject/ovsdb/controller/OvsdbClientService.java
@@ -15,13 +15,14 @@
*/
package org.onosproject.ovsdb.controller;
-import com.google.common.util.concurrent.ListenableFuture;
-import org.onlab.packet.IpAddress;
+import java.util.List;
+import java.util.Set;
+
import org.onosproject.net.DeviceId;
import org.onosproject.net.PortNumber;
import org.onosproject.net.behaviour.ControllerInfo;
-import org.onosproject.net.behaviour.MirroringStatistics;
import org.onosproject.net.behaviour.MirroringName;
+import org.onosproject.net.behaviour.MirroringStatistics;
import org.onosproject.net.behaviour.QosId;
import org.onosproject.net.behaviour.QueueId;
import org.onosproject.ovsdb.rfc.jsonrpc.OvsdbRpc;
@@ -29,9 +30,7 @@
import org.onosproject.ovsdb.rfc.notation.Row;
import org.onosproject.ovsdb.rfc.schema.DatabaseSchema;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import com.google.common.util.concurrent.ListenableFuture;
/**
* Represents to provider facing side of a node.
@@ -156,30 +155,6 @@
Set<OvsdbQueue> getQueues();
/**
- * Creates a tunnel port with given options.
- *
- * @deprecated version 1.7.0 - Hummingbird
- * @param bridgeName bridge name
- * @param portName port name
- * @param tunnelType tunnel type
- * @param options tunnel options
- * @return true if tunnel creation is successful, false otherwise
- */
- @Deprecated
- boolean createTunnel(String bridgeName, String portName, String tunnelType,
- Map<String, String> options);
-
- /**
- * Drops the configuration for tunnel.
- *
- * @deprecated version 1.7.0 - Hummingbird
- * @param srcIp source IP address
- * @param dstIp destination IP address
- */
- @Deprecated
- void dropTunnel(IpAddress srcIp, IpAddress dstIp);
-
- /**
* Creates an interface with a given OVSDB interface description.
*
* @param bridgeName bridge name
@@ -197,39 +172,6 @@
boolean dropInterface(String ifaceName);
/**
- * Creates a bridge.
- *
- * @deprecated version 1.7.0 - Hummingbird
- * @param bridgeName bridge name
- */
- @Deprecated
- void createBridge(String bridgeName);
-
- /**
- * Creates a bridge.
- *
- * @deprecated version 1.7.0 - Hummingbird
- * @param bridgeName bridge name
- * @param dpid data path id
- * @param exPortName external port name
- */
- @Deprecated
- void createBridge(String bridgeName, String dpid, String exPortName);
-
- /**
- * Creates a bridge with given name and dpid.
- * Sets the bridge's controller with given controllers.
- *
- * @deprecated version 1.7.0 - Hummingbird
- * @param bridgeName bridge name
- * @param dpid data path id
- * @param controllers controllers
- * @return true if bridge creation is successful, false otherwise
- */
- @Deprecated
- boolean createBridge(String bridgeName, String dpid, List<ControllerInfo> controllers);
-
- /**
* Creates a bridge with a given bridge description.
*
* @param ovsdbBridge ovsdb bridge description
diff --git a/protocols/ovsdb/api/src/main/java/org/onosproject/ovsdb/controller/driver/DefaultOvsdbClient.java b/protocols/ovsdb/api/src/main/java/org/onosproject/ovsdb/controller/driver/DefaultOvsdbClient.java
index cc6e8b5..2ed28f7 100644
--- a/protocols/ovsdb/api/src/main/java/org/onosproject/ovsdb/controller/driver/DefaultOvsdbClient.java
+++ b/protocols/ovsdb/api/src/main/java/org/onosproject/ovsdb/controller/driver/DefaultOvsdbClient.java
@@ -15,32 +15,36 @@
*/
package org.onosproject.ovsdb.controller.driver;
-import com.fasterxml.jackson.databind.JsonNode;
-import com.google.common.base.Function;
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
-import com.google.common.collect.Sets;
-import com.google.common.util.concurrent.Futures;
-import com.google.common.util.concurrent.ListenableFuture;
-import com.google.common.util.concurrent.SettableFuture;
-
import io.netty.channel.Channel;
+import java.net.InetSocketAddress;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.Set;
+import java.util.concurrent.ConcurrentMap;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
+import java.util.concurrent.atomic.AtomicReference;
+import java.util.stream.Collectors;
+
import org.onlab.packet.IpAddress;
import org.onosproject.net.DeviceId;
import org.onosproject.net.PortNumber;
-import org.onosproject.net.behaviour.BridgeDescription;
import org.onosproject.net.behaviour.ControllerInfo;
-import org.onosproject.net.behaviour.MirroringStatistics;
import org.onosproject.net.behaviour.MirroringName;
+import org.onosproject.net.behaviour.MirroringStatistics;
import org.onosproject.net.behaviour.QosId;
import org.onosproject.net.behaviour.QueueId;
import org.onosproject.ovsdb.controller.OvsdbBridge;
import org.onosproject.ovsdb.controller.OvsdbClientService;
import org.onosproject.ovsdb.controller.OvsdbInterface;
-import org.onosproject.ovsdb.controller.OvsdbInterface.Type;
import org.onosproject.ovsdb.controller.OvsdbMirror;
import org.onosproject.ovsdb.controller.OvsdbNodeId;
import org.onosproject.ovsdb.controller.OvsdbPort;
@@ -51,7 +55,6 @@
import org.onosproject.ovsdb.controller.OvsdbRowStore;
import org.onosproject.ovsdb.controller.OvsdbStore;
import org.onosproject.ovsdb.controller.OvsdbTableStore;
-
import org.onosproject.ovsdb.rfc.jsonrpc.Callback;
import org.onosproject.ovsdb.rfc.message.OperationResult;
import org.onosproject.ovsdb.rfc.message.TableUpdates;
@@ -86,25 +89,38 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import java.net.InetSocketAddress;
-import java.util.ArrayList;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.google.common.base.Function;
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableSet;
+import com.google.common.collect.Lists;
+import com.google.common.collect.Maps;
+import com.google.common.collect.Sets;
+import com.google.common.util.concurrent.Futures;
+import com.google.common.util.concurrent.ListenableFuture;
+import com.google.common.util.concurrent.SettableFuture;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Optional;
-import java.util.Set;
-import java.util.concurrent.ConcurrentMap;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
-import java.util.concurrent.atomic.AtomicReference;
-import java.util.stream.Collectors;
-
-import static org.onosproject.ovsdb.controller.OvsdbConstant.*;
+import static org.onosproject.ovsdb.controller.OvsdbConstant.BRIDGE;
+import static org.onosproject.ovsdb.controller.OvsdbConstant.BRIDGES;
+import static org.onosproject.ovsdb.controller.OvsdbConstant.CONTROLLER;
+import static org.onosproject.ovsdb.controller.OvsdbConstant.DATABASENAME;
+import static org.onosproject.ovsdb.controller.OvsdbConstant.EXTERNAL_ID;
+import static org.onosproject.ovsdb.controller.OvsdbConstant.EXTERNAL_ID_INTERFACE_ID;
+import static org.onosproject.ovsdb.controller.OvsdbConstant.INTERFACE;
+import static org.onosproject.ovsdb.controller.OvsdbConstant.INTERFACES;
+import static org.onosproject.ovsdb.controller.OvsdbConstant.MIRROR;
+import static org.onosproject.ovsdb.controller.OvsdbConstant.MIRRORS;
+import static org.onosproject.ovsdb.controller.OvsdbConstant.OFPORT;
+import static org.onosproject.ovsdb.controller.OvsdbConstant.PORT;
+import static org.onosproject.ovsdb.controller.OvsdbConstant.PORTS;
+import static org.onosproject.ovsdb.controller.OvsdbConstant.PORT_QOS;
+import static org.onosproject.ovsdb.controller.OvsdbConstant.QOS;
+import static org.onosproject.ovsdb.controller.OvsdbConstant.QOS_EXTERNAL_ID_KEY;
+import static org.onosproject.ovsdb.controller.OvsdbConstant.QUEUE;
+import static org.onosproject.ovsdb.controller.OvsdbConstant.QUEUES;
+import static org.onosproject.ovsdb.controller.OvsdbConstant.QUEUE_EXTERNAL_ID_KEY;
+import static org.onosproject.ovsdb.controller.OvsdbConstant.TYPEVXLAN;
+import static org.onosproject.ovsdb.controller.OvsdbConstant.UUID;
/**
* An representation of an ovsdb client.
@@ -462,48 +478,6 @@
}
}
- @Deprecated
- @Override
- public void createBridge(String bridgeName) {
- OvsdbBridge ovsdbBridge = OvsdbBridge.builder()
- .name(bridgeName)
- .build();
-
- createBridge(ovsdbBridge);
- }
-
- @Deprecated
- @Override
- public void createBridge(String bridgeName, String dpid, String exPortName) {
- OvsdbBridge ovsdbBridge = OvsdbBridge.builder()
- .name(bridgeName)
- .failMode(BridgeDescription.FailMode.SECURE)
- .datapathId(dpid)
- .disableInBand()
- .controllers(Lists.newArrayList(localController()))
- .build();
-
- createBridge(ovsdbBridge);
-
- if (exPortName != null) {
- createPort(bridgeName, exPortName);
- }
- }
-
- @Deprecated
- @Override
- public boolean createBridge(String bridgeName, String dpid, List<ControllerInfo> controllers) {
- OvsdbBridge ovsdbBridge = OvsdbBridge.builder()
- .name(bridgeName)
- .failMode(BridgeDescription.FailMode.SECURE)
- .datapathId(dpid)
- .disableInBand()
- .controllers(controllers)
- .build();
-
- return createBridge(ovsdbBridge);
- }
-
@Override
public boolean createBridge(OvsdbBridge ovsdbBridge) {
DatabaseSchema dbSchema = schema.get(DATABASENAME);
@@ -1017,24 +991,6 @@
return;
}
- @Deprecated
- @Override
- public boolean createTunnel(String bridgeName, String ifaceName, String tunnelType,
- Map<String, String> options) {
- OvsdbInterface ovsdbIface = OvsdbInterface.builder()
- .name(ifaceName)
- .type(Type.valueOf(tunnelType))
- .options(options)
- .build();
-
- return createInterface(bridgeName, ovsdbIface);
- }
-
- @Deprecated
- @Override
- public void dropTunnel(IpAddress srcIp, IpAddress dstIp) {
- }
-
@Override
public boolean createInterface(String bridgeName, OvsdbInterface ovsdbIface) {
String bridgeUuid = getBridgeUuid(bridgeName);
diff --git a/protocols/ovsdb/api/src/test/java/org/onosproject/ovsdb/controller/driver/OvsdbClientServiceAdapter.java b/protocols/ovsdb/api/src/test/java/org/onosproject/ovsdb/controller/driver/OvsdbClientServiceAdapter.java
index f6982d6..c05a292 100644
--- a/protocols/ovsdb/api/src/test/java/org/onosproject/ovsdb/controller/driver/OvsdbClientServiceAdapter.java
+++ b/protocols/ovsdb/api/src/test/java/org/onosproject/ovsdb/controller/driver/OvsdbClientServiceAdapter.java
@@ -16,15 +16,14 @@
package org.onosproject.ovsdb.controller.driver;
-import com.fasterxml.jackson.databind.JsonNode;
-import com.google.common.util.concurrent.ListenableFuture;
+import java.util.List;
+import java.util.Set;
-import org.onlab.packet.IpAddress;
import org.onosproject.net.DeviceId;
import org.onosproject.net.PortNumber;
import org.onosproject.net.behaviour.ControllerInfo;
-import org.onosproject.net.behaviour.MirroringStatistics;
import org.onosproject.net.behaviour.MirroringName;
+import org.onosproject.net.behaviour.MirroringStatistics;
import org.onosproject.net.behaviour.QosId;
import org.onosproject.net.behaviour.QueueId;
import org.onosproject.ovsdb.controller.OvsdbBridge;
@@ -40,9 +39,8 @@
import org.onosproject.ovsdb.rfc.operations.Operation;
import org.onosproject.ovsdb.rfc.schema.DatabaseSchema;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.google.common.util.concurrent.ListenableFuture;
/**
* Test Adapter for OvsdbClientService.
@@ -148,15 +146,6 @@
}
@Override
- public boolean createTunnel(String bridgeName, String portName, String tunnelType, Map<String, String> options) {
- return true;
- }
-
- @Override
- public void dropTunnel(IpAddress srcIp, IpAddress dstIp) {
- }
-
- @Override
public boolean createInterface(String bridgeName, OvsdbInterface ovsdbIface) {
return true;
}
@@ -167,15 +156,6 @@
}
@Override
- public void createBridge(String bridgeName) {
- }
-
- @Override
- public boolean createBridge(String bridgeName, String dpid, List<ControllerInfo> controllers) {
- return true;
- }
-
- @Override
public boolean createBridge(OvsdbBridge ovsdbBridge) {
return true;
}
@@ -298,9 +278,4 @@
public ListenableFuture<List<JsonNode>> transact(DatabaseSchema dbSchema, List<Operation> operations) {
return null;
}
-
- @Override
- public void createBridge(String bridgeName, String dpid, String exPortName) {
-
- }
}