Remove deprecated APIs from InterfaceConfig
Change-Id: I7881790548da8e5cbd8bec93b79fe370a30ee442
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 233ec90..b748bb8 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
@@ -809,41 +809,21 @@
}
@Override
- public boolean addAccessInterface(DeviceId deviceId, String intf, VlanId vlanId) {
- return false;
- }
-
- @Override
public boolean addAccessMode(String intf, VlanId vlanId) {
return false;
}
@Override
- public boolean removeAccessInterface(DeviceId deviceId, String intf) {
- return false;
- }
-
- @Override
public boolean removeAccessMode(String intf) {
return false;
}
@Override
- public boolean addTrunkInterface(DeviceId deviceId, String intf, List<VlanId> vlanIds) {
- return false;
- }
-
- @Override
public boolean addTrunkMode(String intf, List<VlanId> vlanIds) {
return false;
}
@Override
- public boolean removeTrunkInterface(DeviceId deviceId, String intf) {
- return false;
- }
-
- @Override
public boolean removeTrunkMode(String intf) {
return false;
}
@@ -900,11 +880,6 @@
}
@Override
- public List<DeviceInterfaceDescription> getInterfaces(DeviceId deviceId) {
- return null;
- }
-
- @Override
public List<DeviceInterfaceDescription> getInterfaces() {
return null;
}
diff --git a/core/api/src/main/java/org/onosproject/net/behaviour/InterfaceConfig.java b/core/api/src/main/java/org/onosproject/net/behaviour/InterfaceConfig.java
index ff28753..9345b78 100644
--- a/core/api/src/main/java/org/onosproject/net/behaviour/InterfaceConfig.java
+++ b/core/api/src/main/java/org/onosproject/net/behaviour/InterfaceConfig.java
@@ -15,13 +15,12 @@
*/
package org.onosproject.net.behaviour;
+import java.util.List;
+
import org.onlab.packet.VlanId;
-import org.onosproject.net.DeviceId;
import org.onosproject.net.device.DeviceInterfaceDescription;
import org.onosproject.net.driver.HandlerBehaviour;
-import java.util.List;
-
/**
* Means to configure interfaces on devices.
*/
@@ -30,18 +29,6 @@
/**
* Adds an access interface to a VLAN.
*
- * @param deviceId the device ID
- * @param intf the name of the interface
- * @param vlanId the VLAN ID
- * @return the result of operation
- * @deprecated in 1.7.0 Hummingbird release - use of addAccessMode() instead
- */
- @Deprecated
- boolean addAccessInterface(DeviceId deviceId, String intf, VlanId vlanId);
-
- /**
- * Adds an access interface to a VLAN.
- *
* @param intf the name of the interface
* @param vlanId the VLAN ID
* @return the result of operation
@@ -51,17 +38,6 @@
/**
* Removes an access interface to a VLAN.
*
- * @param deviceId the device ID
- * @param intf the name of the interface
- * @return the result of operation
- * @deprecated in 1.7.0 Hummingbird release - use of removeAccessMode() instead
- */
- @Deprecated
- boolean removeAccessInterface(DeviceId deviceId, String intf);
-
- /**
- * Removes an access interface to a VLAN.
- *
* @param intf the name of the interface
* @return the result of operation
*/
@@ -70,18 +46,6 @@
/**
* Adds a trunk interface for VLANs.
*
- * @param deviceId the device ID
- * @param intf the name of the interface
- * @param vlanIds the VLAN IDs
- * @return the result of operation
- * @deprecated in 1.7.0 Hummingbird release - use of addTrunkMode() instead
- */
- @Deprecated
- boolean addTrunkInterface(DeviceId deviceId, String intf, List<VlanId> vlanIds);
-
- /**
- * Adds a trunk interface for VLANs.
- *
* @param intf the name of the interface
* @param vlanIds the VLAN IDs
* @return the result of operation
@@ -89,17 +53,6 @@
boolean addTrunkMode(String intf, List<VlanId> vlanIds);
/**
- * Removes trunk mode configuration from an interface.
- *
- * @param deviceId the device ID
- * @param intf the name of the interface
- * @return the result of operation
- * @deprecated in 1.7.0 Hummingbird release - use of removeTrunkMode() instead
- */
- @Deprecated
- boolean removeTrunkInterface(DeviceId deviceId, String intf);
-
- /**
* Removes trunk mode configuration from an interface.
*
* @param intf the name of the interface
@@ -161,17 +114,6 @@
/**
* Provides the interfaces configured on a device.
*
- * @param deviceId the device ID
- * @return the list of the configured interfaces
- * @deprecated in 1.7.0 Hummingbird release - use of getInterfaces() without
- * deviceId as parameter instead
- */
- @Deprecated
- List<DeviceInterfaceDescription> getInterfaces(DeviceId deviceId);
-
- /**
- * Provides the interfaces configured on a device.
- *
* @return the list of the configured interfaces
*/
List<DeviceInterfaceDescription> getInterfaces();
diff --git a/drivers/cisco/netconf/src/main/java/org/onosproject/drivers/cisco/InterfaceConfigCiscoIosImpl.java b/drivers/cisco/netconf/src/main/java/org/onosproject/drivers/cisco/InterfaceConfigCiscoIosImpl.java
index e551ded..18d5b1c 100644
--- a/drivers/cisco/netconf/src/main/java/org/onosproject/drivers/cisco/InterfaceConfigCiscoIosImpl.java
+++ b/drivers/cisco/netconf/src/main/java/org/onosproject/drivers/cisco/InterfaceConfigCiscoIosImpl.java
@@ -17,9 +17,12 @@
package org.onosproject.drivers.cisco;
+import java.io.ByteArrayInputStream;
+import java.nio.charset.StandardCharsets;
+import java.util.List;
+
import org.onlab.packet.VlanId;
import org.onosproject.drivers.utilities.XmlConfigParser;
-import org.onosproject.net.DeviceId;
import org.onosproject.net.behaviour.InterfaceConfig;
import org.onosproject.net.behaviour.PatchDescription;
import org.onosproject.net.behaviour.TunnelDescription;
@@ -30,10 +33,6 @@
import org.onosproject.netconf.NetconfSession;
import org.slf4j.Logger;
-import java.io.ByteArrayInputStream;
-import java.nio.charset.StandardCharsets;
-import java.util.List;
-
import static com.google.common.base.Preconditions.checkNotNull;
import static org.slf4j.LoggerFactory.getLogger;
@@ -48,19 +47,6 @@
/**
* Adds an access interface to a VLAN.
*
- * @param deviceId the device ID
- * @param intf the name of the interface
- * @param vlanId the VLAN ID
- * @return the result of operation
- */
- @Override
- public boolean addAccessInterface(DeviceId deviceId, String intf, VlanId vlanId) {
- return addAccessMode(intf, vlanId);
- }
-
- /**
- * Adds an access interface to a VLAN.
- *
* @param intf the name of the interface
* @param vlanId the VLAN ID
* @return the result of operation
@@ -106,18 +92,6 @@
/**
* Removes an access interface to a VLAN.
*
- * @param deviceId the device ID
- * @param intf the name of the interface
- * @return the result of operation
- */
- @Override
- public boolean removeAccessInterface(DeviceId deviceId, String intf) {
- return removeAccessMode(intf);
- }
-
- /**
- * Removes an access interface to a VLAN.
- *
* @param intf the name of the interface
* @return the result of operation
*/
@@ -160,19 +134,6 @@
/**
* Adds a trunk interface for VLANs.
*
- * @param deviceId the device ID
- * @param intf the name of the interface
- * @param vlanIds the VLAN IDs
- * @return the result of operation
- */
- @Override
- public boolean addTrunkInterface(DeviceId deviceId, String intf, List<VlanId> vlanIds) {
- return addTrunkMode(intf, vlanIds);
- }
-
- /**
- * Adds a trunk interface for VLANs.
- *
* @param intf the name of the interface
* @param vlanIds the VLAN IDs
* @return the result of operation
@@ -220,18 +181,6 @@
/**
* Removes trunk mode configuration from an interface.
*
- * @param deviceId the device ID
- * @param intf the name of the interface
- * @return the result of operation
- */
- @Override
- public boolean removeTrunkInterface(DeviceId deviceId, String intf) {
- return removeTrunkMode(intf);
- }
-
- /**
- * Removes trunk mode configuration from an interface.
- *
* @param intf the name of the interface
* @return the result of operation
*/
@@ -425,17 +374,6 @@
/**
* Provides the interfaces configured on a device.
*
- * @param deviceId the device ID
- * @return the list of the configured interfaces
- */
- @Override
- public List<DeviceInterfaceDescription> getInterfaces(DeviceId deviceId) {
- return getInterfaces();
- }
-
- /**
- * Provides the interfaces configured on a device.
- *
* @return the list of the configured interfaces
*/
@Override
diff --git a/drivers/ovsdb/src/main/java/org/onosproject/drivers/ovsdb/OvsdbInterfaceConfig.java b/drivers/ovsdb/src/main/java/org/onosproject/drivers/ovsdb/OvsdbInterfaceConfig.java
index 7b6f0ff..54de460 100644
--- a/drivers/ovsdb/src/main/java/org/onosproject/drivers/ovsdb/OvsdbInterfaceConfig.java
+++ b/drivers/ovsdb/src/main/java/org/onosproject/drivers/ovsdb/OvsdbInterfaceConfig.java
@@ -119,32 +119,6 @@
throw new UnsupportedOperationException("Not implemented yet");
}
- // deprecated interfaces
- @Override
- public boolean addAccessInterface(DeviceId deviceId, String ifaceName, VlanId vlanId) {
- throw new UnsupportedOperationException("Not implemented yet");
- }
-
- @Override
- public boolean removeAccessInterface(DeviceId deviceId, String ifaceName) {
- throw new UnsupportedOperationException("Not implemented yet");
- }
-
- @Override
- public boolean addTrunkInterface(DeviceId deviceId, String ifaceName, List<VlanId> vlanIds) {
- throw new UnsupportedOperationException("Not implemented yet");
- }
-
- @Override
- public List<DeviceInterfaceDescription> getInterfaces(DeviceId deviceId) {
- return null;
- }
-
- @Override
- public boolean removeTrunkInterface(DeviceId deviceId, String ifaceName) {
- throw new UnsupportedOperationException("Not implemented yet");
- }
-
// OvsdbNodeId(IP) is used in the adaptor while DeviceId(ovsdb:IP)
// is used in the core. So DeviceId need be changed to OvsdbNodeId.
private OvsdbNodeId changeDeviceIdToNodeId(DeviceId deviceId) {