Remove deprecated Bridge APIs
Change-Id: If5edc12deee0cf45880680eb1b9a9a2288a4ea42
diff --git a/apps/openstacknode/app/src/test/java/org/onosproject/openstacknode/impl/DefaultOpenstackNodeHandlerTest.java b/apps/openstacknode/app/src/test/java/org/onosproject/openstacknode/impl/DefaultOpenstackNodeHandlerTest.java
index 4e1c523..233ec90 100644
--- a/apps/openstacknode/app/src/test/java/org/onosproject/openstacknode/impl/DefaultOpenstackNodeHandlerTest.java
+++ b/apps/openstacknode/app/src/test/java/org/onosproject/openstacknode/impl/DefaultOpenstackNodeHandlerTest.java
@@ -15,10 +15,13 @@
*/
package org.onosproject.openstacknode.impl;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
-import com.google.common.util.concurrent.MoreExecutors;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Set;
+import java.util.stream.Collectors;
+
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -49,7 +52,6 @@
import org.onosproject.net.behaviour.BridgeConfig;
import org.onosproject.net.behaviour.BridgeDescription;
import org.onosproject.net.behaviour.BridgeName;
-import org.onosproject.net.behaviour.ControllerInfo;
import org.onosproject.net.behaviour.DefaultBridgeDescription;
import org.onosproject.net.behaviour.ExtensionTreatmentResolver;
import org.onosproject.net.behaviour.InterfaceConfig;
@@ -85,22 +87,33 @@
import org.onosproject.ovsdb.controller.OvsdbClientService;
import org.onosproject.ovsdb.controller.OvsdbController;
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Set;
-import java.util.stream.Collectors;
+import com.google.common.collect.ImmutableSet;
+import com.google.common.collect.Lists;
+import com.google.common.collect.Maps;
+import com.google.common.util.concurrent.MoreExecutors;
-import static org.easymock.EasyMock.*;
+import static org.easymock.EasyMock.anyObject;
+import static org.easymock.EasyMock.createMock;
import static org.easymock.EasyMock.expect;
+import static org.easymock.EasyMock.replay;
import static org.junit.Assert.assertEquals;
import static org.onosproject.net.AnnotationKeys.PORT_NAME;
import static org.onosproject.net.Device.Type.CONTROLLER;
import static org.onosproject.net.Device.Type.SWITCH;
-import static org.onosproject.net.device.DeviceEvent.Type.*;
-import static org.onosproject.openstacknode.api.Constants.*;
-import static org.onosproject.openstacknode.api.NodeState.*;
+import static org.onosproject.net.device.DeviceEvent.Type.DEVICE_ADDED;
+import static org.onosproject.net.device.DeviceEvent.Type.DEVICE_AVAILABILITY_CHANGED;
+import static org.onosproject.net.device.DeviceEvent.Type.PORT_ADDED;
+import static org.onosproject.net.device.DeviceEvent.Type.PORT_REMOVED;
+import static org.onosproject.openstacknode.api.Constants.DEFAULT_TUNNEL;
+import static org.onosproject.openstacknode.api.Constants.INTEGRATION_BRIDGE;
+import static org.onosproject.openstacknode.api.Constants.PATCH_INTG_BRIDGE;
+import static org.onosproject.openstacknode.api.Constants.PATCH_ROUT_BRIDGE;
+import static org.onosproject.openstacknode.api.Constants.ROUTER_BRIDGE;
+import static org.onosproject.openstacknode.api.NodeState.COMPLETE;
+import static org.onosproject.openstacknode.api.NodeState.DEVICE_CREATED;
+import static org.onosproject.openstacknode.api.NodeState.INCOMPLETE;
+import static org.onosproject.openstacknode.api.NodeState.INIT;
+import static org.onosproject.openstacknode.api.NodeState.PORT_CREATED;
import static org.onosproject.openstacknode.api.OpenstackNode.NodeType.COMPUTE;
import static org.onosproject.openstacknode.api.OpenstackNode.NodeType.GATEWAY;
@@ -725,21 +738,6 @@
}
@Override
- public void addBridge(BridgeName bridgeName) {
-
- }
-
- @Override
- public void addBridge(BridgeName bridgeName, String dpid, String exPortName) {
-
- }
-
- @Override
- public boolean addBridge(BridgeName bridgeName, String dpid, List<ControllerInfo> controllers) {
- return false;
- }
-
- @Override
public boolean addBridge(BridgeDescription bridge) {
TEST_DEVICE_SERVICE.addDevice(new DefaultDevice(new ProviderId("of", "foo"),
DeviceId.deviceId("of:" + bridge.datapathId().get()),
diff --git a/core/api/src/main/java/org/onosproject/net/behaviour/BridgeConfig.java b/core/api/src/main/java/org/onosproject/net/behaviour/BridgeConfig.java
index c39138e..fe223d0 100644
--- a/core/api/src/main/java/org/onosproject/net/behaviour/BridgeConfig.java
+++ b/core/api/src/main/java/org/onosproject/net/behaviour/BridgeConfig.java
@@ -29,39 +29,6 @@
public interface BridgeConfig extends HandlerBehaviour {
/**
- * Add a bridge.
- *
- * @deprecated version 1.7.0 - Hummingbird
- * @param bridgeName bridge name
- */
- @Deprecated
- void addBridge(BridgeName bridgeName);
-
- /**
- * Adds a bridge with given bridge name, dpid and exPortName.
- *
- * @deprecated version 1.7.0 - Hummingbird
- * @param bridgeName bridge name
- * @param dpid dpid
- * @param exPortName external port name
- */
- @Deprecated
- void addBridge(BridgeName bridgeName, String dpid, String exPortName);
-
- /**
- * Adds a bridge with given bridge name and dpid, and sets the controller
- * of the bridge with given controllers.
- *
- * @deprecated version 1.7.0 - Hummingbird
- * @param bridgeName bridge name
- * @param dpid dpid
- * @param controllers list of controller
- * @return true if succeeds, fail otherwise
- */
- @Deprecated
- boolean addBridge(BridgeName bridgeName, String dpid, List<ControllerInfo> controllers);
-
- /**
* Adds a bridge with a given description.
*
* @param bridgeDescription bridge description
diff --git a/drivers/ovsdb/src/main/java/org/onosproject/drivers/ovsdb/OvsdbBridgeConfig.java b/drivers/ovsdb/src/main/java/org/onosproject/drivers/ovsdb/OvsdbBridgeConfig.java
index 3e573dd..89eb22b 100644
--- a/drivers/ovsdb/src/main/java/org/onosproject/drivers/ovsdb/OvsdbBridgeConfig.java
+++ b/drivers/ovsdb/src/main/java/org/onosproject/drivers/ovsdb/OvsdbBridgeConfig.java
@@ -17,6 +17,13 @@
package org.onosproject.drivers.ovsdb;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
+
import org.onlab.packet.IpAddress;
import org.onosproject.net.DefaultAnnotations;
import org.onosproject.net.DeviceId;
@@ -24,7 +31,6 @@
import org.onosproject.net.behaviour.BridgeConfig;
import org.onosproject.net.behaviour.BridgeDescription;
import org.onosproject.net.behaviour.BridgeName;
-import org.onosproject.net.behaviour.ControllerInfo;
import org.onosproject.net.behaviour.DefaultBridgeDescription;
import org.onosproject.net.device.DefaultPortDescription;
import org.onosproject.net.device.PortDescription;
@@ -36,13 +42,6 @@
import org.onosproject.ovsdb.controller.OvsdbNodeId;
import org.onosproject.ovsdb.controller.OvsdbPort;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-import java.util.Set;
-import java.util.stream.Collectors;
-
/**
* The implementation of BridageConfig.
@@ -50,49 +49,6 @@
public class OvsdbBridgeConfig extends AbstractHandlerBehaviour
implements BridgeConfig {
- @Deprecated
- @Override
- public void addBridge(BridgeName bridgeName) {
- BridgeDescription bridgeDesc = DefaultBridgeDescription.builder()
- .name(bridgeName.name())
- .build();
-
- addBridge(bridgeDesc);
- }
-
- @Deprecated
- @Override
- public void addBridge(BridgeName bridgeName, String dpid, String exPortName) {
- BridgeDescription bridgeDesc = DefaultBridgeDescription.builder()
- .name(bridgeName.name())
- .failMode(BridgeDescription.FailMode.SECURE)
- .datapathId(dpid)
- .disableInBand()
- .enableLocalController()
- .build();
-
- addBridge(bridgeDesc);
-
- OvsdbClientService client = getOvsdbClientService(handler());
- if (client == null) {
- return;
- }
- client.createPort(bridgeName.name(), exPortName);
- }
-
- @Deprecated
- @Override
- public boolean addBridge(BridgeName bridgeName, String dpid, List<ControllerInfo> controllers) {
- BridgeDescription bridgeDesc = DefaultBridgeDescription.builder()
- .name(bridgeName.name())
- .failMode(BridgeDescription.FailMode.SECURE)
- .datapathId(dpid)
- .disableInBand()
- .controllers(controllers)
- .build();
-
- return addBridge(bridgeDesc);
- }
@Override
public boolean addBridge(BridgeDescription bridgeDesc) {