commit 10f2adeb18f73564aad714e14a4feb3d8f6adc4f
author Hyunsun Moon <hyunsun.moon@gmail.com> Thu Jun 16 17:31:37 2016 -0700
committer Gerrit Code Review <gerrit@onlab.us> Fri Jun 17 02:25:31 2016 +0000
tree ad2e5a570a59f2bc21892483150050fb49f04e0f
parent 015d3a34c23378158e98dd6700485b6fbaf7707f

Removed deprecated methods in Falcon

Change-Id: I535d19de70da0352ffb9c2a897099af57e01287c

core/api/src/main/java/org/onosproject/net/behaviour/BridgeConfig.java

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 3b47079..d1ff51a 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
@@ -84,15 +84,6 @@
     Collection<BridgeDescription> getBridges();
 
     /**
-     * Add a logical/virtual port.
-     * @deprecated version 1.5.0 - Falcon.
-     *
-     * @param port port number
-     */
-    @Deprecated
-    void addPort(PortDescription port);
-
-    /**
      * Adds a port to a given bridge.
      *
      * @param bridgeName bridge name
@@ -101,15 +92,6 @@
     void addPort(BridgeName bridgeName, String portName);
 
     /**
-     * Delete a logical/virtual port.
-     * @deprecated version 1.5.0 - Falcon.
-     *
-     * @param port port number
-     */
-    @Deprecated
-    void deletePort(PortDescription port);
-
-    /**
      * Removes a port from a given bridge.
      *
      * @param bridgeName bridge name

drivers/ovsdb/src/main/java/org/onosproject/drivers/ovsdb/OvsdbBridgeConfig.java

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 5022799..02402a5 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
@@ -120,36 +120,12 @@
                 .collect(Collectors.toSet());
     }
 
-    //Deprecated from version 1.5.0 - Falcon
-    @Deprecated
-    @Override
-    public void addPort(PortDescription port) {
-        OvsdbClientService client = getOvsdbClientService(handler());
-        Set<OvsdbBridge> ovsdbSet = client.getBridges();
-        if (ovsdbSet != null && ovsdbSet.size() > 0) {
-            OvsdbBridge bridge = ovsdbSet.iterator().next();
-            client.createPort(bridge.name(), port.portNumber().toString());
-        }
-    }
-
     @Override
     public void addPort(BridgeName bridgeName, String portName) {
         OvsdbClientService client = getOvsdbClientService(handler());
         client.createPort(bridgeName.name(), portName);
     }
 
-    //Deprecated from version 1.5.0 - Falcon
-    @Deprecated
-    @Override
-    public void deletePort(PortDescription port) {
-        OvsdbClientService client = getOvsdbClientService(handler());
-        Set<OvsdbBridge> ovsdbSet = client.getBridges();
-        if (ovsdbSet != null && ovsdbSet.size() > 0) {
-            OvsdbBridge bridge = ovsdbSet.iterator().next();
-            client.dropPort(bridge.name(), port.portNumber().toString());
-        }
-    }
-
     @Override
     public void deletePort(BridgeName bridgeName, String portName) {
         OvsdbClientService client = getOvsdbClientService(handler());